Show More
@@ -500,7 +500,7 b' class dirstate(object):' | |||||
500 | return True |
|
500 | return True | |
501 |
|
501 | |||
502 | @requires_parents_change |
|
502 | @requires_parents_change | |
503 |
def update_file_ |
|
503 | def update_file_p1( | |
504 | self, |
|
504 | self, | |
505 | filename, |
|
505 | filename, | |
506 | p1_tracked, |
|
506 | p1_tracked, |
@@ -1487,13 +1487,13 b' def movedirstate(repo, newctx, match=Non' | |||||
1487 | s = newctx.status(oldctx, match=match) |
|
1487 | s = newctx.status(oldctx, match=match) | |
1488 |
|
1488 | |||
1489 | for f in s.modified: |
|
1489 | for f in s.modified: | |
1490 |
ds.update_file_ |
|
1490 | ds.update_file_p1(f, p1_tracked=True) | |
1491 |
|
1491 | |||
1492 | for f in s.added: |
|
1492 | for f in s.added: | |
1493 |
ds.update_file_ |
|
1493 | ds.update_file_p1(f, p1_tracked=False) | |
1494 |
|
1494 | |||
1495 | for f in s.removed: |
|
1495 | for f in s.removed: | |
1496 |
ds.update_file_ |
|
1496 | ds.update_file_p1(f, p1_tracked=True) | |
1497 |
|
1497 | |||
1498 | # Merge old parent and old working dir copies |
|
1498 | # Merge old parent and old working dir copies | |
1499 | oldcopies = copiesmod.pathcopies(newctx, oldctx, match) |
|
1499 | oldcopies = copiesmod.pathcopies(newctx, oldctx, match) |
General Comments 0
You need to be logged in to leave comments.
Login now