Mercurial > evolve
changeset 461:cd43fd9f923f
merge
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Tue, 21 Aug 2012 02:37:53 +0200 |
parents | 3477326461e3 (current diff) 19bba3c91246 (diff) |
children | d38e02332c2c |
files | hgext/obsolete.py |
diffstat | 1 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/obsolete.py Wed Aug 15 16:54:48 2012 +0200 +++ b/hgext/obsolete.py Tue Aug 21 02:37:53 2012 +0200 @@ -707,6 +707,8 @@ nc = toproceed.pop() for mark in allobjects.get(nc, ()): for sub in mark[1]: + if sub == nullid: + continue # should not be here! if sub not in seen: seen.add(sub) toproceed.append(sub)