equal
deleted
inserted
replaced
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) |
|
1469 repo._quick_access_changeid_invalidate() |
1469 |
1470 |
1470 |
1471 |
1471 def writerequires(opener, requirements): |
1472 def writerequires(opener, requirements): |
1472 with opener(b'requires', b'w', atomictemp=True) as fp: |
1473 with opener(b'requires', b'w', atomictemp=True) as fp: |
1473 for r in sorted(requirements): |
1474 for r in sorted(requirements): |