Changes between Version 3 and Version 4 of ropp_branches

Timestamp:

2015-10-21T13:51:39Z (9 years ago)

Author:

Dave Offiler

Comment:

--

ropp_branches

@@ -5 +5 @@
 '''Creating a branch'''
 
-To create a branch of ropp_src from the trunk use the [http://svnbook.red-bean.com/en/1.0/re07.html svn copy ''SRC DST''] command:
+To create a branch of {{{ropp_src}}} from the trunk use the [http://svnbook.red-bean.com/en/1.0/re07.html svn copy ''SRC DST''] command:
 {{{
-svn copy https://svn.grassaf.org/ropp/ropp_src/trunk https://svn.grassaf.org/ropp/ropp_src/branches/dev/Share/<branch_name>
+svn copy https://svn.romsaf.org/ropp/ropp_src/trunk https://svn.romsaf.org/ropp/ropp_src/branches/dev/Share/<branch_name>
 }}}
 where <branch name> is a name of your choice which should reflect what you are working on. This prompts a text editor where you should describe the purpose of the new branch.
@@ -16 +16 @@
 }}}
 
-Similar branches may be created to store user versions of ropp_doc or ropp_test as required.
+Similar branches may be created to store user versions of {{{ropp_doc}}} or {{{ropp_test}}} as required.
 
 '''Checking out a branch'''
@@ -22 +22 @@
 To make developments, the branch needs to be checked out to the local working directory for editing as above, specifying the path name for the required branch as
 {{{
-svn checkout https://svn.grassaf.org/ropp/ropp_src/branches/dev/Share/<branch_name>
+svn checkout https://svn.romsaf.org/ropp/ropp_src/branches/dev/Share/<branch_name> ${HOME}/<SVN_working_dir>/<branch name>
 }}}
 
@@ -51 +51 @@
 For a branch was created or last updated at revision ''NNNN'', the following command will merge all changes made in trunk since that revision into your branch.
 {{{
-svn merge -r NNNN:HEAD https://svn.grassaf.org/ropp/ropp_src/trunk
+svn merge -r NNNN:HEAD https://svn.romsaf.org/ropp/ropp_src/trunk
 }}}
 When you do this, you should see the list of updates that have been made to the trunk since you last brought in any changes (or since you branched). Note that this only results in changes to your working copy so you might want to commit them to the repository. 
@@ -58 +58 @@
 {{{
 cd ${HOME}/<SVN_working_dir>/<branch name>
-svn merge --dry-run -r NNNN:HEAD https://svn.grassaf.org/ropp/ropp_src/trunk
+svn merge --dry-run -r NNNN:HEAD https://svn.romsaf.org/ropp/ropp_src/trunk
 }}}
 
@@ -68 +68 @@
 [http://svnbook.red-bean.com/en/1.0/ch04.html#svn-ch-4-sect-1 SVN reference: Branching and Merging]
 
-[https://trac.grassaf.org/ropp/wiki/ropp_repository Back]
+[https://trac.romsaf.org/ropp/wiki/ropp_repository Back]