chris.johnk at gmail.com
Thu Mar 24 16:14:47 CDT 2011
In the svn 1.4 version of the book, the documentation of the merge
command includes an example of merging trunk changes into a branch to
keep the branch current with mainline development:
svn merge -r 23:30 file:///tmp/repos/trunk/vendors
This is an incredibly useful example, as it clarifies that when doing
this sort of merge, you want to specify the range of revisions on
trunk whose changes you wish to merge.
Other examples I've seen in the current book simply show such a merge like this:
svn merge file:///tmp/repos/trunk/vendors
This form failed for me, because I am working on a branch that was
created at revision 2150, and the merge command wanted to go all the
way back to the earliest trunk revision without the revisions
specified. As a result, merge was trying unsuccessfully to bring in
changes that made no sense for the branch.
I couldn't find any clear explanation of what was going wrong anywhere
else in the documentation. It wasn't until I found this example with
the revisions in it that I understood what I needed to do. It took me
way too long to find this example. Please put this example back into
the merge command documentation.
More information about the svnbook-dev