diff options
| author | Steven Knight <knight@baldmt.com> | 2006-11-04 20:26:57 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2006-11-04 20:26:57 (GMT) |
| commit | d9773d1a6c940d27c2a3607658dd2538d9f69a24 (patch) | |
| tree | 9bd2f271b166856fdbdcef9fe1995aeb1bde6905 /www | |
| parent | c36a10f28f1c38541757cbbe96d67cd87a2096e7 (diff) | |
| download | SCons-d9773d1a6c940d27c2a3607658dd2538d9f69a24.zip SCons-d9773d1a6c940d27c2a3607658dd2538d9f69a24.tar.gz SCons-d9773d1a6c940d27c2a3607658dd2538d9f69a24.tar.bz2 | |
Update the instructions to correct a few errors in setting up svnmerge
on branches. Add a few clarifying comments.
Diffstat (limited to 'www')
| -rw-r--r-- | www/branching.html | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/www/branching.html b/www/branching.html index 904d368..48ead83 100644 --- a/www/branching.html +++ b/www/branching.html @@ -124,11 +124,11 @@ $ svn commit $ cd .. $ svn co $SVN/branches/new_branch $ cd new_branch -$ svnmerge init -S $SVN/trunk -f commit.txt -$ cd ../trunk -$ svnmerge init -S $SVN/branches/new_branch -f commit.txt +$ svnmerge init -f commit.txt $SVN/trunk +$ cd ../../trunk +$ svnmerge init -f commit.txt $SVN/branches/new_branch $ svn commit -F commit.txt && rm commit.txt -$ cd ../new_branch +$ cd ../branches/new_branch $ svn commit -F commit.txt && rm commit.txt </pre> @@ -158,9 +158,17 @@ $ svnmerge avail -b -S $SVN/trunk -l $ svnmerge merge -b -S $SVN/trunk -f commit.txt $ svn resolved . $ svn diff +$ python runtest.py -a $ svn commit -F commit.txt && rm commit.txt </pre> +<p> +The <tt>svn resolved .</tt> is there because there may be a +conflict on the <tt>svnmerge-integrated</tt>property +that's attached to the directory to track what changes +have or have not already been merged from the trunk. +</p> + <h2>How to merge changes from a development branch to the trunk</h2> <p> @@ -181,11 +189,12 @@ $ svnmerge avail -b -S $SVN/branches/new_branch -l $ svnmerge merge -b -S $SVN/branches/new_branch -f commit.txt $ svn resolved . $ svn diff +$ python runtest.py -a $ svn commit -F commit.txt && rm commit.txt </pre> <p> -The <tt>svn resolved .</tt> is there because there will be a +The <tt>svn resolved .</tt> is there because there may be a conflict on the <tt>svnmerge-integrated</tt>property that's attached to the directory to track what changes have or have not already been merged from the development branch. |