[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: John Gardiner Myers <jgmyers_at_proofpoint.com>
Date: Wed, 31 Dec 2008 09:15:07 -0800

Augie Fackler wrote:
>
> Ah, it's been too long since I looked at the code. What happens now if
> --non-interactive is specified and the merge tool exits with a nonzero
> status? You should end up with a 'C'onflicted file in status output at
> the end.
It currently behaves the same for a non-{0,1} status as it does for a 1
status. The merge proceeds and subsequent conflicting files are left in
conflicted state, as if "--accept postpone" had been specified.

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=997045
Received on 2008-12-31 20:14:34 CET

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