equal
deleted
inserted
replaced
1503 dst: oldcopies.get(src, src) |
1503 dst: oldcopies.get(src, src) |
1504 for dst, src in pycompat.iteritems(oldcopies) |
1504 for dst, src in pycompat.iteritems(oldcopies) |
1505 } |
1505 } |
1506 # Adjust the dirstate copies |
1506 # Adjust the dirstate copies |
1507 for dst, src in pycompat.iteritems(copies): |
1507 for dst, src in pycompat.iteritems(copies): |
1508 if src not in newctx or dst in newctx or ds[dst] != b'a': |
1508 if src not in newctx or dst in newctx or not ds.get_entry(dst).added: |
1509 src = None |
1509 src = None |
1510 ds.copy(src, dst) |
1510 ds.copy(src, dst) |
1511 repo._quick_access_changeid_invalidate() |
1511 repo._quick_access_changeid_invalidate() |
1512 |
1512 |
1513 |
1513 |