Skip to content
Snippets Groups Projects
Commit 298c9f34 authored by Mads Kiilerich's avatar Mads Kiilerich
Browse files

commit: use revlog.commonancestors instead of .ancestor

This do probably not make any real difference but is slightly more correct and
we would like to get rid of flog.ancestor.
parent 6ae0c41e
No related branches found
No related tags found
No related merge requests found
......@@ -1154,6 +1154,6 @@
fparent1, fparent2 = fparent2, nullid
elif fparent2 != nullid:
# is one parent an ancestor of the other?
fparentancestor = flog.ancestor(fparent1, fparent2)
if fparentancestor == fparent1:
fparentancestors = flog.commonancestors(fparent1, fparent2)
if fparent1 in fparentancestors:
fparent1, fparent2 = fparent2, nullid
......@@ -1159,5 +1159,5 @@
fparent1, fparent2 = fparent2, nullid
elif fparentancestor == fparent2:
elif fparent2 in fparentancestors:
fparent2 = nullid
# is the file changed?
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment