Jamie Wellnitz wrote:
> On Thu, Aug 17, 2006 at 10:24:53AM -0700, Blair Zajac wrote:
>> Jamie Wellnitz wrote:
>>> If you run "svnmerge.py init -S branch" on the trunk (and commit the
>>> change) just after creating the branch (wich "svn copy"), each of the
>>> periodic branch -> trunk merges shown should just be:
>
> Thanks - that's right. I forgot about that little inconsistency in
> the svnmerge.py options.
>
>> Also, this won't work, "svnmerge.py init branch" because svnmerge.py will
>> assume that revisions 1-HEAD have already been merged from the branch to
>> the trunk and set the svnmerge:integrated property to be 1:HEAD, whatever
>> revision HEAD is. In this case, you also need to supply the -r command line
>> option to pick the revision when the branch was created, and pass -r 1:N as
>> that.
>
> That's why I said "just after creating the branch". Then the
> integrated property will be set correctly.
Yes, you did say that :)
Regards,
Blair
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Aug 17 20:18:50 2006