[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: Paul Burba <pburba_at_collab.net>
Date: 2007-03-13 21:37:52 CET

Hi Kamesh,

I should have mentioned that I was aware of the failure as a result of
r23758. I was going to take care of that in a separate commit but Dan
and I were working a few things out re the patch first. I was taking
some liberties with the fact I was working in a branch. Anyhow, in the
future I'll let you know if I'm doing something like this so we don't
duplicate efforts.


Regarding your patch, you changed the test so the last merge is an
expected no-op. I think it's better to keep the spirit of the orginal
test intact by changing the revert of 'merge_tests-1.other/A/D/G/rho' to
a reverse merge of r3 instead. That way 'merge_tests-1.other/A/D/G/rho'
gets it's own mergeinfo:

  Properties on 'merge_tests-1.other':
    svn:mergeinfo : /:2-3
  Properties on 'merge_tests-1.other\A\D\G\rho':
    svn:mergeinfo : /A/D/G/rho:2

And we *should* be able to continue the test as before, merging -r2:3
into 'merge_tests-1.other/A/D/G'. We'd skip 'pi' and 'tau' because
'merge_tests-1.other/A/D/G' inherits the mergeinfo from the root of the
WC. But 'rho' should still be merged again because it's own mergeinfo
shows that it only has r2.

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.

> -----Original Message-----
> From: Kamesh Jayachandran [mailto:kamesh@collab.net]
> Sent: Tuesday, March 13, 2007 10:10 AM
> To: SVN Dev
> Subject: [PATCH][merge-tracking]merge_tests 1 fails after r23785
> Hi All,
> Find the attached patch and log.
> With regards
> Kamesh Jayachandram

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Received on Tue Mar 13 21:38:05 2007

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