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

Re: [PATCH] Allow the merge tool to abort the merge

From: Stefan Sperling <stsp_at_elego.de>
Date: Wed, 25 Feb 2009 15:32:56 +0000

On Wed, Feb 25, 2009 at 01:48:43PM +0000, Stefan Sperling wrote:
> On Wed, Dec 31, 2008 at 03:49:47AM +0100, Stefan Sperling wrote:
> > On Tue, Dec 30, 2008 at 10:22:12AM -0800, John Gardiner Myers wrote:
> > > Stefan Sperling wrote:
> > > > Can you post the script?
> > > The merge tool script I've been testing with is just something I hand
> > > edit to suit whatever case I'm testing at the moment. The current
> > > incarnation is:
> > >
> >
> > [snip]
> >
> > Thanks!
> >
> > > Please let me know what else I need to do in order to get any of my
> > > three outstanding patches committed.
> >
> > I'd like to get more people involved in this discussion.
> >
> > I don't feel confident enough to give exit 2 a special meaning
> > without having heard opinions from people who have worked on the
> > external merge tool support. I've put them in Cc to make them aware
> > of this. Augie, Eric, please read this thread and let us know what
> > you think.
>
> So, there were no strong objections raised in this thread.
>
> I have committed a tweaked version of this patch in r36126
> (tweakage by me, Julian Foad and Stephen Butler).
>
> John, could you check if Subversion as or r36126 does what you
> want it to do?

Ooops, should have done some basic testing before bothering you
with this, sorry.

Turns out r36126 does not do all that's needed.
Please don't bother testing with just that revision.

Julian and I have a patch in progress that adds the remaining bits
that are needed. The diff also fixes the bug were a file is left
in the WC with conflict markers but scheduled M instead of C.

Running regression tests now, as soon as they pass I'll commit.

Stefan
Received on 2009-02-25 16:33:41 CET

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