Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pushkey: properly handle abort during obsolete markers push stable
authorDavid Douard <david.douard@logilab.fr>
Tue, 31 Jul 2012 15:23:01 +0200
branchstable
changeset 409 c4cc1d5eba7a
parent 408 6b2f50c81967
child 410 598ff1df3b92
pushkey: properly handle abort during obsolete markers push
hgext/obsolete.py file | annotate | diff | comparison | revisions 
--- a/hgext/obsolete.py	Tue Jul 31 15:04:59 2012 +0200
+++ b/hgext/obsolete.py	Tue Jul 31 15:23:01 2012 +0200
@@ -451,8 +451,11 @@
     data = base85.b85decode(new)
     lock = repo.lock()
     try:
-        repo.obsstore.mergemarkers(data)
-        return 1
+        try:
+            repo.obsstore.mergemarkers(data)
+            return 1
+        except util.Abort:
+            return 0
     finally:
         lock.release()
evolve