Mercurial > hg > mutable-history

changeset 409:c4cc1d5eba7a stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pushkey: properly handle abort during obsolete markers push
author David Douard <david.douard@logilab.fr>
date Tue, 31 Jul 2012 15:23:01 +0200
parents 6b2f50c81967
children 598ff1df3b92
files hgext/obsolete.py
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/obsolete.py
+++ b/hgext/obsolete.py
@@ -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()