branch | stable |
changeset 409 | c4cc1d5eba7a |
parent 408 | 6b2f50c81967 |
child 411 | 4c1997e41d18 |
child 415 | ea7f2a4ad530 |
--- 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()