Strip aborts: no node!

Andrei Vermel andrei.vermel at gmail.com
Sat Nov 1 11:41:40 CDT 2008


Following patch fixes the problem for me.

# HG changeset patch
# User Andrei Vermel <avermel at mail.ru>
# Date 1225557354 -10800
# Node ID 112b0f35370495de4d7889c2c2f1ef5cf126b898
# Parent  30300b14ecd6499467866204ca6ddd664b75f4d6
Fix strip to abort with 'no node' when stripping a sibling of a current
changeset

diff --git a/hgext/bookmarks.py b/hgext/bookmarks.py
--- a/hgext/bookmarks.py
+++ b/hgext/bookmarks.py
@@ -202,7 +202,8 @@
         def addchangegroup(self, source, srctype, url, emptyok=False):
             try:
                 onode = repo.changectx('.').node()
-            except RepoError, inst:
+            except (RepoError, LookupError), inst:
+                onode = None
                 pass
 
             result = super(bookmark_repo, self).addchangegroup(
-------------- next part --------------
A non-text attachment was scrubbed...
Name: fix_bookmarks.patch
Type: application/octet-stream
Size: 743 bytes
Desc: not available
Url : http://selenic.com/pipermail/mercurial-devel/attachments/20081101/ab8b30cb/attachment.obj 


More information about the Mercurial-devel mailing list