equal
deleted
inserted
replaced
1429 a matcher that doesn't match all the differences between the parent of the |
1429 a matcher that doesn't match all the differences between the parent of the |
1430 working copy and newctx. |
1430 working copy and newctx. |
1431 """ |
1431 """ |
1432 oldctx = repo[b'.'] |
1432 oldctx = repo[b'.'] |
1433 ds = repo.dirstate |
1433 ds = repo.dirstate |
|
1434 copies = dict(ds.copies()) |
1434 ds.setparents(newctx.node(), nullid) |
1435 ds.setparents(newctx.node(), nullid) |
1435 copies = dict(ds.copies()) |
|
1436 s = newctx.status(oldctx, match=match) |
1436 s = newctx.status(oldctx, match=match) |
1437 for f in s.modified: |
1437 for f in s.modified: |
1438 if ds[f] == b'r': |
1438 if ds[f] == b'r': |
1439 # modified + removed -> removed |
1439 # modified + removed -> removed |
1440 continue |
1440 continue |