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

Re: reverse-merge broken?

From: Mark Phippard <markphip_at_gmail.com>
Date: 2007-10-18 16:54:28 CEST

On 10/18/07, Kamesh Jayachandran <kamesh@collab.net> wrote:

> Do you have any mergeinfo on a target from the corresponding merge
> source? Then only the 'avoid repeat reverse merge code kicks in' and
> hence no reverse merge.
> Probably we may need '--merge-insensitive' or '-G' to support repeat
> reverse merge.

Since a reverse merge is always going to be an explicit user
operation, maybe we ought to just not try to avoid repeat reverse
merges? The user has already signified they want to reverse the
merge, so why not just try to do it? What is the scenario where this
is going to lead to incorrect behavior?

Mark Phippard
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Oct 18 16:54:41 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.