Show More
@@ -1168,7 +1168,7 b' class localrepository(object):' | |||||
1168 | fparent1, fparent2 = fparent2, nullid |
|
1168 | fparent1, fparent2 = fparent2, nullid | |
1169 | elif fparent2 != nullid: |
|
1169 | elif fparent2 != nullid: | |
1170 | # is one parent an ancestor of the other? |
|
1170 | # is one parent an ancestor of the other? | |
1171 | fparentancestors = flog.commonancestors(fparent1, fparent2) |
|
1171 | fparentancestors = flog.commonancestorsheads(fparent1, fparent2) | |
1172 | if fparent1 in fparentancestors: |
|
1172 | if fparent1 in fparentancestors: | |
1173 | fparent1, fparent2 = fparent2, nullid |
|
1173 | fparent1, fparent2 = fparent2, nullid | |
1174 | elif fparent2 in fparentancestors: |
|
1174 | elif fparent2 in fparentancestors: |
General Comments 0
You need to be logged in to leave comments.
Login now