Changes between Version 3 and Version 4 of ropp_repository

Timestamp:

2008-03-13T11:01:12Z (16 years ago)

Author:

Huw Lewis

Comment:

--

ropp_repository

@@ -73 +73 @@
 {{{
 cd ${HOME}/<SVN_working_dir>/<branch name>
-svn merge https://svn.grassaf.org/ropp/ropp_src/trunk
+}}}
+For a branch was created at revision ''NNNN'', the following command will merge all changes made in trunk since the branch was created into your branch.
+{{{
+svn merge -r NNNN:HEAD https://svn.grassaf.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. 
@@ -80 +83 @@
 {{{
 cd ${HOME}/<SVN_working_dir>/<branch name>
-svn merge --dry-run https://svn.grassaf.org/ropp/ropp_src/trunk
+svn merge --dry-run -r NNNN:HEAD https://svn.grassaf.org/ropp/ropp_src/trunk
 }}}
+
+The merge command can be used separately on subdirectories and files within a branch as required.
 
 Further information on branches are available in 
 [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_branches Instructions for working with branches]