[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: Daniel L. Rall <dlr_at_finemaltcoding.com>
Date: 2007-10-19 02:55:30 CEST

On Thu, 18 Oct 2007, Mark Phippard wrote:

> 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?

We absolutely have to perform the reverse merge, regardless of mergeinfo
on the merge target.

-- 
Daniel Rall

  • application/pgp-signature attachment: stored
Received on Fri Oct 19 02:55:39 2007

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