equal
deleted
inserted
replaced
1152 |
1152 |
1153 elif fparent1 == nullid: |
1153 elif fparent1 == nullid: |
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 fparentancestor == fparent1: |
1158 if fparent1 in fparentancestors: |
1159 fparent1, fparent2 = fparent2, nullid |
1159 fparent1, fparent2 = fparent2, nullid |
1160 elif fparentancestor == fparent2: |
1160 elif fparent2 in fparentancestors: |
1161 fparent2 = nullid |
1161 fparent2 = nullid |
1162 |
1162 |
1163 # is the file changed? |
1163 # is the file changed? |
1164 if fparent2 != nullid or flog.cmp(fparent1, text) or meta: |
1164 if fparent2 != nullid or flog.cmp(fparent1, text) or meta: |
1165 changelist.append(fname) |
1165 changelist.append(fname) |