equal
deleted
inserted
replaced
1455 ds.remove(f) |
1455 ds.remove(f) |
1456 |
1456 |
1457 # Merge old parent and old working dir copies |
1457 # Merge old parent and old working dir copies |
1458 oldcopies = copiesmod.pathcopies(newctx, oldctx, match) |
1458 oldcopies = copiesmod.pathcopies(newctx, oldctx, match) |
1459 oldcopies.update(copies) |
1459 oldcopies.update(copies) |
1460 copies = dict( |
1460 copies = { |
1461 (dst, oldcopies.get(src, src)) |
1461 dst: oldcopies.get(src, src) |
1462 for dst, src in pycompat.iteritems(oldcopies) |
1462 for dst, src in pycompat.iteritems(oldcopies) |
1463 ) |
1463 } |
1464 # Adjust the dirstate copies |
1464 # Adjust the dirstate copies |
1465 for dst, src in pycompat.iteritems(copies): |
1465 for dst, src in pycompat.iteritems(copies): |
1466 if src not in newctx or dst in newctx or ds[dst] != b'a': |
1466 if src not in newctx or dst in newctx or ds[dst] != b'a': |
1467 src = None |
1467 src = None |
1468 ds.copy(src, dst) |
1468 ds.copy(src, dst) |