Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgext3rd/evolve/stablerange.py
changeset 3329 c056f125e17d
parent 3327 0abc8fb7f49f
child 3330 a67a586792dc 
--- a/hgext3rd/evolve/stablerange.py	Wed Dec 20 17:59:14 2017 +0100
+++ b/hgext3rd/evolve/stablerange.py	Wed Dec 20 17:56:38 2017 +0100
@@ -530,7 +530,7 @@
                     jumphead = merge
                     refjumps = iter(getjumps(merge))
                     ref = next(refjumps, None)
-            elif mainjump == ref:
+            elif ref is not None and mainjump[0:2] == ref[0:2]:
                 # both follow the same path
                 size += mainsize
                 jumphead = mainjump[1]
evolve