C. Michael Pilato
cmpilato at red-bean.com
Fri Mar 25 14:15:20 CDT 2011
On 03/24/2011 05:14 PM, Chris Johnk wrote:
> 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.
What version of Subversion were you running when doing this?
C. Michael Pilato <cmpilato at red-bean.com> | http://cmpilato.blogspot.com/
More information about the svnbook-dev