Re: SVN Merge questions
From: John Peacock <john.peacock_at_havurah-software.org>
Date: Mon, 25 Feb 2008 07:43:53 -0500
I-Smith, Brooke wrote:
Because the '-r' option does not operate on changesets like you are expecting;
You may want to use the '-c' parameter instead, if that makes more sense to you.
svn merge -c 21 ...
which is in every way equivalent to
svn merge -r20:21 ...
The presence of '22' in your original merge is misleading because you are
> Secondly, when you merge should you avoid where you have merged before? As in the above scenario I would have thought I wouldn't want r:20:22.
Yes, you should avoid merging what you have already merged before. If you do
In other words:
svn merge -c 21 $REPO/branches/bsmith
where you want to merge in the changes made _on that branch_ in revisions 43-47
FWIW, when 1.5.0 is released, it will have much better merge support, so
Does that help?
John
---------------------------------------------------------------------
|
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.