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

Re: Re-merge a change from own history - corrupts svn:mergeinfo

From: Mark Phippard <markphip_at_gmail.com>
Date: Mon, 31 Mar 2008 22:09:20 -0400

On Mon, Mar 31, 2008 at 9:50 PM, Paul Burba <ptburba_at_gmail.com> wrote:

> I agree that we need to clarify the effect --ignore-ancestry has
> regarding mergeinfo. Your fix is certainly correct in that it fixes
> the bogus mergeinfo/segfault, but I'm not sure that it is correct in
> terms of expanding the meaning of --ignore-ancestry to mean *not*
> setting mergeinfo. To get back to what Karl said earlier in this
> thread, maybe we need a --no-record option so we can do all of the
> following:
> A) Ignore mergeinfo when calculating what to merge and don't set any mergeinfo
> B) Ignore mergeinfo when calculating what to merge but set mergeinfo
> describing the merge
> C) Consider mergeinfo when calculating what to merge but don't set any mergeinfo
> D) Consider mergeinfo when calculating what to merge and set mergeinfo
> describing the merge
> Question is, are there valid use cases for all of these? Obviously
> there is for D, that's Merge Tracking(TM)! B is what using
> --ignore-ancestry today does and it seems potentially useful in cases
> like those described in issue #2898 - Imagine a case like that
> described in http://subversion.tigris.org/issues/show_bug.cgi?id=2898#desc7
> where there are other subtrees with mergeinfo that we want
> updated/elided.
> But for A and C I can't come up with a valid use case...Given that B
> and D are handled today, for 1.5 I'd be happy just fixing
> do_file_merge() and waiting to see if we need a --no-record option to
> enable A and C and putting it in 1.6.
> > It certainly seems to fix the problem. I'm running "make check" now.
> FWIW It will break merge_tests.py 19 and 60, but in both cases it
> would just be a matter of tweaking the tests to agree with the new
> meaning of --ignore-ancestry.

I am confused. Why would we want --ignore-ancestry to record
mergeinfo? If we are not considering mergeinfo as part of the merge,
then it seems like we should not be recording it either. It seems not
unlike the case of merging from a foreign repository, where we also do
not consider or record mergeinfo.

Mark Phippard
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-04-01 04:09:31 CEST

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.