[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: Julian Foad <julianfoad_at_btopenworld.com>
Date: Tue, 01 Apr 2008 18:54:02 +0100

Julian Foad wrote:
>> I think it should stay the way it is and just take your original patch
>> so that it works as it was intended. I recall when Mike P. added some
>> of this that he was pretty clear that it had to ignore mergeinfo
>> anyway, and I really cannot see it being that controversial for it to
>> not write any mergeinfo when you use this flag.
>> If we really did decide in the future that these need to be separated,
>> which I doubt, then I do not see why we could not just change the API
>> and introduce additional options at that point.
> Right: maybe I'm making a mountain out of a molehill. The only essential
> thing we have to do is ensure that we agree on the meaning of
> "--ignore-ancestry". If and when Paul agrees that it should include "do
> not record any new mergeinfo" as part of its meaning, then we're all set.

(Replying to myself)

Yes, Paul agrees and so there is nothing more to do here than to apply my
little patch that I posted before that makes the meaning of "--ignore-ancestry"
consistent with how we've defined it.

(All that talk of API changes and user interfaces was just speculation really.
If we ever find a need to do it we can do it then.)

Will commit the fix soon.

- Julian

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 19:54:21 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.