Mercurial > hg
diff hgext/bookmarks.py @ 13032:e41e2b79883d
dirstate: warn on invalid parents rather than aborting
This allows more graceful recovery from some mangled dirstates
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 22 Nov 2010 12:43:31 -0600 |
parents | 3da456d0c885 |
children | e298cca2d53a |
line wrap: on
line diff
--- a/hgext/bookmarks.py Mon Nov 22 18:15:58 2010 +0100 +++ b/hgext/bookmarks.py Mon Nov 22 12:43:31 2010 -0600 @@ -348,14 +348,12 @@ return result def addchangegroup(self, *args, **kwargs): - parents = self.dirstate.parents() - result = super(bookmark_repo, self).addchangegroup(*args, **kwargs) if result > 1: # We have more heads than before return result node = self.changelog.tip() - + parents = self.dirstate.parents() self._bookmarksupdate(parents, node) return result