[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, 31 Dec 2008 03:49:47 +0100

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.

> I believe the discussion on the
> semantics of exit 1 to largely be a digression, fixable in future patches.

That's true, but it's quite an important digression nonetheless. :)

Thanks,
Stefan

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=996515
Received on 2008-12-31 03:51:08 CET

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