Show More
@@ -1154,10 +1154,10 b' class localrepository(object):' | |||||
1154 | fparent1, fparent2 = fparent2, nullid |
|
1154 | fparent1, fparent2 = fparent2, nullid | |
1155 | elif fparent2 != nullid: |
|
1155 | elif fparent2 != nullid: | |
1156 | # is one parent an ancestor of the other? |
|
1156 | # is one parent an ancestor of the other? | |
1157 | fparentancestor = flog.ancestor(fparent1, fparent2) |
|
1157 | fparentancestors = flog.commonancestors(fparent1, fparent2) | |
1158 |
if fparent |
|
1158 | if fparent1 in fparentancestors: | |
1159 | fparent1, fparent2 = fparent2, nullid |
|
1159 | fparent1, fparent2 = fparent2, nullid | |
1160 |
elif fparent |
|
1160 | elif fparent2 in fparentancestors: | |
1161 | fparent2 = nullid |
|
1161 | fparent2 = nullid | |
1162 |
|
1162 | |||
1163 | # is the file changed? |
|
1163 | # is the file changed? |
General Comments 0
You need to be logged in to leave comments.
Login now