# HG changeset patch
# User David Douard <david.douard@logilab.fr>
# Date 1343740981 -7200
# Node ID c4cc1d5eba7ab8c6eb8363a01dbbf0330d7e7f74
# Parent  6b2f50c81967fbcbe9eaab2ffe452578581dcd4b
pushkey: properly handle abort during obsolete markers push

diff --git a/hgext/obsolete.py b/hgext/obsolete.py
--- 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()