# HG changeset patch # User Benoit Boissinot # Date 1148455636 -7200 # Node ID 925610b2d90a146bff5319d41e5854435e848dd5 # Parent 4f7745fc9823c5c71f9d0ac59d88cb7afc774046# Parent ae12e5a2c4a31e9543700dd40e92f79f6ae72c7d merge with crew diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -871,7 +871,7 @@ class localrepository(object): b = [] for n in nodes: t = n - while n: + while 1: p = self.changelog.parents(n) if p[1] != nullid or p[0] == nullid: b.append((t, n, p[0], p[1]))