[prev in list] [next in list] [prev in thread] [next in thread]
List: mercurial
Subject: [PATCH] return a non-zero exit code when a merge failed
From: Benoit Boissinot <benoit.boissinot () ens-lyon ! org>
Date: 2006-01-29 20:25:49
Message-ID: 20060129202549.GF18963 () ens-lyon ! fr
[Download RAW message or body]
# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Node ID c7eca6a6a69a32b8cf4b2d78ec5ba3f8a46bcd3f
# Parent b2df93c56ac47c24c46e193c5afdc5a6f687c8a6
return a non-zero exit code when a merge failed
diff -r b2df93c56ac4 -r c7eca6a6a69a mercurial/localrepo.py
--- a/mercurial/localrepo.py Sun Jan 29 20:30:41 2006 +1300
+++ b/mercurial/localrepo.py Sun Jan 29 21:20:26 2006 +0100
@@ -1383,6 +1383,8 @@ class localrepository(object):
self.ui.warn(_("aborting: outstanding uncommitted merges\n"))
return 1
+ err = False
+
p1, p2 = pl[0], node
pa = self.changelog.ancestor(p1, p2)
m1n = self.changelog.read(p1)[0]
@@ -1598,7 +1600,9 @@ class localrepository(object):
for f in files:
self.ui.status(_("merging %s\n") % f)
my, other, flag = merge[f]
- self.merge3(f, my, other)
+ ret = self.merge3(f, my, other)
+ if ret:
+ err = True
util.set_exec(self.wjoin(f), flag)
if moddirstate:
if branch_merge:
@@ -1631,6 +1635,7 @@ class localrepository(object):
if moddirstate:
self.dirstate.setparents(p1, p2)
+ return err
def merge3(self, fn, my, other):
"""perform a 3-way merge in the working directory"""
@@ -1661,6 +1666,7 @@ class localrepository(object):
os.unlink(b)
os.unlink(c)
+ return r
def verify(self):
filelinkrevs = {}
_______________________________________________
Mercurial mailing list
Mercurial@selenic.com
http://selenic.com/mailman/listinfo/mercurial
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic