# HG changeset patch # User Pierre-Yves David <pierre-yves.david@logilab.fr> # Date 1341929268 -7200 # Tue Jul 10 16:07:48 2012 +0200 # Branch stable # Node ID 4ecbaec1d664b1e6f8ebc78292e1ced77a8e69c0 # Parent b836862d48b44857b8991b7241776604bf86b02c Ignore buggy marker in newerversion diff --git a/hgext/obsolete.py b/hgext/obsolete.py --- a/hgext/obsolete.py +++ b/hgext/obsolete.py @@ -756,6 +756,7 @@ while toproceed: current = toproceed.pop() assert len(current) <= 1, 'splitting not handled yet. %r' % current + current = [n for n in current if n != nullid] if current: n, = current if n in objectrels: