[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: Fri, 27 Feb 2009 13:17:01 +0000

On Wed, Feb 25, 2009 at 03:32:56PM +0000, Stefan Sperling wrote:
> 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.

As of r36178, Subversion passes the filename of the conflicted
file to the external merge tool, and aborts the merge if the
tool exists with an exit code other than 0 or 1.

The bug where a file was marked M even though it still contains
conflict markers has also been fixed as of that revision, such
files are now left in conflicted state.

John, please test these changes if you can. If you have the time,
please feel free to take a look at the log message of that commit,
at http://svn.collab.net/viewvc/svn?view=revision&revision=36178
It would be nice if your patch submissions contained a log
message in that format in the future. Also, a passing test suite
makes it more likely for your patches to be processed quickly.
Please see http://svn.tigris.org/hacking.html for details on
both these issues.

Nevertheless, thanks a lot for your patches, they were vital
in making this happen!

Received on 2009-02-27 14:17:36 CET

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.