diff -r 5cc7905bccc9 -r 1ffeeb91c55d mercurial/ancestor.py --- a/mercurial/ancestor.py Tue May 31 20:39:04 2011 -0500 +++ b/mercurial/ancestor.py Wed Jun 01 12:38:46 2011 +0200 @@ -76,7 +76,7 @@ # increment each ancestor list until it is closer to root than # the other, or they match try: - while 1: + while True: if gx[0] == gy[0]: for v in gx[1]: if v in gy[1]: