2009-06-19 14:25 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

* tests/testhrb.prg * tests/exthrb.prg ! Fixed missing SVN props. * ChangeLog ! Removed conflict marker from ChangeLog from a recent commit. ; NOTE: I'd encourage everyone to check doc/howtosvn.txt before committing. * doc/howtosvn.txt + Added link to svn cmdline tools. + Added link to svn online documentation (a complete free book) ! Fixed a few svn commands written in uppercase.
2009-06-19 12:25:44 +00:00
parent 0b660d8efd
commit 9500012b64
4 changed files with 101 additions and 77 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,22 @@
   past entries belonging to author(s): Viktor Szakats.
 */

+2009-06-19 14:25 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * tests/testhrb.prg
+  * tests/exthrb.prg
+    ! Fixed missing SVN props.
+
+  * ChangeLog
+    ! Removed conflict marker from ChangeLog from a recent commit.
+
+    ; NOTE: I'd encourage everyone to check doc/howtosvn.txt
+            before committing.
+
+  * doc/howtosvn.txt
+    + Added link to svn cmdline tools.
+    + Added link to svn online documentation (a complete free book)
+    ! Fixed a few svn commands written in uppercase.
+
 2009-06-19 14:09 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
  - harbour/include/hbhrb.ch
  + harbour/include/hbhrb.ch
@@ -133,7 +149,6 @@
    * Reverted to r11403 for Pritpal.
      (now for real)

->>>>>>> .r11422
 2009-06-18 21:18 UTC+0200 Jean lefebvre (jfl at mafact dot com)
  * vm/runner.c
    + Added options to HB_HRBLOAD() :
--- a/harbour/doc/howtosvn.txt
+++ b/harbour/doc/howtosvn.txt
@@ -5,6 +5,15 @@
 HOW TO USE THE SVN
 ------------------

+First and if your OS doesn't have it by default (like Windows, OS/2),
+download the client from this link:
+
+   http://subversion.tigris.org
+
+For a very good free book about svn, look at this link:
+
+   http://svnbook.red-bean.com/
+
 Content
 =======

@@ -36,10 +45,10 @@ by Viktor Szakats

 1) Do the changes in the source, and in parallel modify ChangeLog
 2) Go online (if needed)
- 3) SVN UPDATE
+ 3) svn update
 4) Resolve all conflicts
 5) Copy the last ChangeLog entry to the clipboard
- 6) SVN COMMIT --editor-cmd notepad.exe --username sfuser
+ 6) svn commit --editor-cmd notepad.exe --username sfuser
    Change notepad.exe to the editor of your choice and platform.
    Change "sfuser" to your sf.net username.
 7) The SVN pops up a window with the changed filenames
@@ -55,19 +64,19 @@ alternative method:
 by Ryszard Glab

 1) Do the changes in the source
- 2) Run SVN UPDATE redirecting the output into a file
-    (for example: "SVN update -d >.log"
+ 2) Run 'svn update' redirecting the output into a file
+    (for example: "svn update -d >.log"
 3) Resolve all conflicts, run SVN update again (see point 2), recompile
    all sources, fix all errors
- 4) Run SVN STATUS redirecting the output into a file
+ 4) Run 'svn status' redirecting the output into a file
    (for example: "svn status >.log"
 5) Copy all names of modifed, added or deleted files (files marked with
    'M', 'A' or 'D' flag) from update log into a ChangeLog
 6) Write necessary comments in the ChangeLog
 7) Save all your changes from ChangeLog into a file
- 8) Run SVN UPDATE again
+ 8) Run 'svn update' again
 9) Commit changes running:
-    SVN commit -F file_with_saved_ChangeLog_changes --username sfuser
+    svn commit -F file_with_saved_ChangeLog_changes --username sfuser
 10) Mail file_with_saved_ChangeLog_changes as an email body (do not
    send it as an attachment) to the harbour list

@@ -140,7 +149,7 @@ by David G. Holm
   changes and you only need to recompile and retest before committing.

 2) Always run 'SVN update' from the 'harbour' directory before you run
-   'SVN commit'. Ideally, you should redirect the output from the update
+   'svn commit'. Ideally, you should redirect the output from the update
   to a file and look at the results to confirm that you are ready to do
   a commit. Any files marked M, A or D are files that you have modified
   or are adding or deleting. Confirm that you have comments for all of
@@ -150,7 +159,7 @@ by David G. Holm
   If you see any conflicts reported in the update output, then you need
   to resolve them before committing. SVN is generally good at merging
   changes, so you probably won't see conflicts very often, but if you
-   edit the ChangeLog file before you run 'SVN update' and other changes
+   edit the ChangeLog file before you run 'svn update' and other changes
   have been committed by others, then ChangeLog will have conflicts. To
   resolve those conflicts, simply remove the conflict markers. What I do
   to avoid conflicts to ChangeLog is to record my changes in changes.txt
--- a/harbour/tests/exthrb.prg
+++ b/harbour/tests/exthrb.prg
@@ -1,13 +1,13 @@
-//
-// $Id: extmsg.prg 0001 2009-06-18 20:20:41 j. lefebvre $
-//
-
-// see also testhrb.prg
-
-
-Function Msg()
-? "Function called from HRB file"
-Return .T.
-
-Function msg2()
-Return Msg()
+//
+// $Id$
+//
+
+// see also testhrb.prg
+
+
+Function Msg()
+? "Function called from HRB file"
+Return .T.
+
+Function msg2()
+Return Msg()
--- a/harbour/tests/testhrb.prg
+++ b/harbour/tests/testhrb.prg
@@ -1,54 +1,54 @@
-//
-// $Id: testhrb.prg 0001 2009-06-18 20:20:41 j. lefebvre $
-//
-
-// see also exthrb.prg
-
-
-#include "hbhrb.ch"
-
-Procedure Main(x)
-Local pHrb, cExe := "Msg2()", n
-
-  n:=iif(x==NIL,0,val(x))
-
-  ? "calling Msg ... From exe here !"
-  Msg()
-  ? "========================="
-
-//  ? "Loading('exthrb.hrb' )"
-//  pHrb := hb_HrbLoad("exthrb.hrb" )
-
-//  ? "Loading(HB_HRB_DEFAULT,'exthrb.hrb' )"
-//  pHrb := hb_HrbLoad(HB_HRB_DEFAULT,"exthrb.hrb" )
-
-//  ? "Loading(HB_HRB_KEEP_LOCAL,'exthrb.hrb' )"
-//  pHrb := hb_HrbLoad(HB_HRB_KEEP_LOCAL,"exthrb.hrb" )
-
-  ? "Loading("+iif(n=0,"HB_HRB_DEFAULT",iif(n=1,"HB_HRB_KEEP_LOCAL","HB_HRB_KEEP_GLOBAL"))+",'exthrb.hrb' )"
-  pHrb := hb_HrbLoad(n,"exthrb.hrb" )
-
-  ? "========================="
-
-  ? "calling Msg ... DEFAULT=From exe, LOCAL=From exe, GLOBAL=From HRB"
-  Msg()
-  ? "========================="
-
-  ? "calling Msg ... DEFAULT=From exe, LOCAL=From HRB, GLOBAL=From HRB"
-  &cExe  //
-  ? "========================="
-
-  hb_HrbUnload( pHrb ) // should do nothing in case of GLOBAL
-
-  ? "calling Msg ... DEFAULT=From exe, LOCAL=From exe, GLOBAL=From HRB"
-  Msg() // test unload protection when using GLOBAL ... then Hrb not anymore unloadable
-  ? "========================="
-
-  ?  "END"
-
-Return
-
-
-Function Msg()
-? "Function called from Exe"
-Return .T.
+//
+// $Id$
+//
+
+// see also exthrb.prg
+
+
+#include "hbhrb.ch"
+
+Procedure Main(x)
+Local pHrb, cExe := "Msg2()", n
+
+  n:=iif(x==NIL,0,val(x))
+
+  ? "calling Msg ... From exe here !"
+  Msg()
+  ? "========================="
+
+//  ? "Loading('exthrb.hrb' )"
+//  pHrb := hb_HrbLoad("exthrb.hrb" )
+
+//  ? "Loading(HB_HRB_DEFAULT,'exthrb.hrb' )"
+//  pHrb := hb_HrbLoad(HB_HRB_DEFAULT,"exthrb.hrb" )
+
+//  ? "Loading(HB_HRB_KEEP_LOCAL,'exthrb.hrb' )"
+//  pHrb := hb_HrbLoad(HB_HRB_KEEP_LOCAL,"exthrb.hrb" )
+
+  ? "Loading("+iif(n=0,"HB_HRB_DEFAULT",iif(n=1,"HB_HRB_KEEP_LOCAL","HB_HRB_KEEP_GLOBAL"))+",'exthrb.hrb' )"
+  pHrb := hb_HrbLoad(n,"exthrb.hrb" )
+
+  ? "========================="
+
+  ? "calling Msg ... DEFAULT=From exe, LOCAL=From exe, GLOBAL=From HRB"
+  Msg()
+  ? "========================="
+
+  ? "calling Msg ... DEFAULT=From exe, LOCAL=From HRB, GLOBAL=From HRB"
+  &cExe  //
+  ? "========================="
+
+  hb_HrbUnload( pHrb ) // should do nothing in case of GLOBAL
+
+  ? "calling Msg ... DEFAULT=From exe, LOCAL=From exe, GLOBAL=From HRB"
+  Msg() // test unload protection when using GLOBAL ... then Hrb not anymore unloadable
+  ? "========================="
+
+  ?  "END"
+
+Return
+
+
+Function Msg()
+? "Function called from Exe"
+Return .T.