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

Re: [PATCH][merge-tracking]merge_tests 1 fails after r23785

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: 2007-03-14 16:06:32 CET

Hi Paul,

> I keep saying "should" because this doesn't currently work. When the
> last merge is performed (r2:3 into /A/D/G) no textual merge occurs,
> although the mergeinfo on rho is correctly updated. I'm still trying to
> figure out what's wrong but that's a separate issue from the test, so
> I'm sending this along now.
> Paul B.
My reasoning for the failure is,
* When you did a revert 'r-3' on other_wc/A/D/G/rho. It did a magic of
getting the mergeinfo from 'other_wc' as '2-3' and removed 3 from it and
retained 2.
* When you do subsequent merge on other_wc/A/D/G, 'find_wc_merge_info'
adds '2-3' of 'other_wc and '2' of 'other_wc/A/D/G/rho' and gives '2-3',
this makes our merge a no-op on rho too.

With regards
Kamesh Jayachandran

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Mar 14 16:06:58 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.