[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: 2-URL merges incorrectly reverse-merge mergeinfo for merge target?

From: Stefan Sperling <stsp_at_elego.de>
Date: Wed, 2 Jun 2010 12:38:34 +0200

On Wed, May 19, 2010 at 10:11:57AM -0400, C. Michael Pilato wrote:
> Note that if we change the order of operations a bit -- if we calculate the
> merge-driven mergeinfo diff first, and then apply it to the target, we're in
> better shape:
>
> {trunk:6-14, feature1:6-15} - {feature2:10-11 -trunk:6-15} =
> {-trunk:15, feature1:6-15, -feature2:10-11}
>
> {-trunk:15, feature1:6-15, -feature2:10-11} + {trunk:10-13} =
> {trunk:10-13, -trunk:15, feature1:6-15, -feature2:10-11}
>
> With all the unrecordable negative mergeinfo removed, that's
> {trunk:10-13, feature1:6-15}
>
> Making the final mergeinfo diff for the operation simply:
>
> Merged /branches/feature1:6-15
>
> Does that make sense?

This is now tracked as issue #3648:
http://subversion.tigris.org/issues/show_bug.cgi?id=3648

Stefan
Received on 2010-06-02 12:39:16 CEST

This is an archived mail posted to the Subversion Dev mailing list.