Mercurial > hg > mutable-history

diff hgext/obsolete.py @ 58:2ba7355f6e11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[obsolete] Fix pushkey
author Pierre-Yves David <pierre-yves.david@logilab.fr>
date Fri, 09 Sep 2011 11:15:59 +0200 (2011-09-09)
parents 27f9c0d0a996
children aee53d546849
line wrap: on
line diff
--- a/hgext/obsolete.py
+++ b/hgext/obsolete.py
@@ -99,7 +99,11 @@
         relations = repo._obsdeserialise(tmp)
         for sub, objs in relations.iteritems():
             for obj in objs:
-                repo.addobsolete(sub, obj)
+                try:
+                    repo.addobsolete(sub, obj)
+                except error.RepoLookupError:
+                    pass
+        return 0
     finally:
         w.release()
 
@@ -245,7 +249,7 @@
             if 'obsolete' in remote.listkeys('namespaces'):
                 tmp = StringIO()
                 repo._obsserialise(tmp)
-                remote.pushkey('obsolete', 'relations', {}, tmp.getvalue())
+                remote.pushkey('obsolete', 'relations', '', tmp.getvalue())
 
             return result