[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: Tue, 30 Dec 2008 10:22:12 -0800

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:


print "Merge tool called on $ARGV[4]\n";

if ($ARGV[4] eq 'tools/xtools/build-tools') {
    print "Resolving...\n";
    open (my $in, '<', $ARGV[2]) or exit 2;
    open (my $out, '>', $ARGV[3]) or exit 2;
    while (<$in>) {
        print $out $_;
    exit 0;

exit 2;

I don't have any script to create a test repository, I just use
conflicts that exist in my existing repository.

Please let me know what else I need to do in order to get any of my
three outstanding patches committed. I believe the discussion on the
semantics of exit 1 to largely be a digression, fixable in future patches.

Received on 2008-12-30 20:13:15 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.