Mercurial Mercurial > hg / 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.
mercurial/localrepo.py
changeset 21106 53433d8f1faa
parent 21071 19b9f23a8c6f
child 21140 4aeb8da68090 
--- a/mercurial/localrepo.py	Thu Apr 17 20:01:39 2014 +0200
+++ b/mercurial/localrepo.py	Thu Apr 17 20:01:39 2014 +0200
@@ -1168,7 +1168,7 @@
             fparent1, fparent2 = fparent2, nullid
         elif fparent2 != nullid:
             # is one parent an ancestor of the other?
-            fparentancestors = flog.commonancestors(fparent1, fparent2)
+            fparentancestors = flog.commonancestorsheads(fparent1, fparent2)
             if fparent1 in fparentancestors:
                 fparent1, fparent2 = fparent2, nullid
             elif fparent2 in fparentancestors:
Mercurial