[BOOK] Error in description of merge?

There is an example of merging branch changes back into the trunk at the
end of the page here:
http://svnbook.red-bean.com/en/1.1/ch04s04.html#svn-ch-4-sect-4.1

The idea being to update the trunk with changes made in the branch.

$ cd trunk-working-copy

$ svn update
At revision 1910.

$ svn merge http://svn.example.com/repos/calc/mybranch@1910 \
            http://svn.example.com/repos/calc/trunk@1910 \
U real.c
U integer.c
A newdirectory
A newdirectory/newfile

If I understand correctly, the 2 URLs are shown reversed in the svn
merge command: You want to merge the differences between trunk (old) and
branch (new) into trunk WC.

In the reference section on merge, there is no indication of parameter
order, although you might guess that it follows the same pattern as
diff.

The version of the book shipping with 1.1.2 (Windows distribution) does
not contain the 'Common Branching Patterns' section at all - is it a
recent change, or is the Windows help file not building correctly.

Simon

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jan 13 18:04:58 2005