From: stevenknight <stevenknight@fdb21ef1-2011-0410-befe-b5e4ea1792b1>
Date: Sat, 4 Nov 2006 20:26:57 +0000 (+0000)
Subject: Update the instructions to correct a few errors in setting up svnmerge
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b8767fbb18e6da0531cdeff6d9845af969046235;p=scons.git

Update the instructions to correct a few errors in setting up svnmerge
on branches.  Add a few clarifying comments.


git-svn-id: http://scons.tigris.org/svn/scons/trunk@1684 fdb21ef1-2011-0410-befe-b5e4ea1792b1
---

diff --git a/www/branching.html b/www/branching.html
index 904d3684..48ead83d 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.