Show More
@@ -1558,12 +1558,12 b' class localrepository(object):' | |||||
1558 |
|
1558 | |||
1559 | r = ctx2._poststatus(ctx1, r, match, listignored, listclean, |
|
1559 | r = ctx2._poststatus(ctx1, r, match, listignored, listclean, | |
1560 | listunknown) |
|
1560 | listunknown) | |
1561 | modified, added, removed, deleted, unknown, ignored, clean = r |
|
|||
1562 |
|
1561 | |||
1563 | if reversed: |
|
1562 | if reversed: | |
1564 | added, removed = removed, added |
|
1563 | # since we are maintaining whether we reversed ctx1 and ctx2 (due | |
1565 |
|
1564 | # to comparing the workingctx with its parent), we need to switch | ||
1566 | r = modified, added, removed, deleted, unknown, ignored, clean |
|
1565 | # back added files (r[1]) and removed files (r[2]) | |
|
1566 | r[1], r[2] = r[2], r[1] | |||
1567 |
|
1567 | |||
1568 | if listsubrepos: |
|
1568 | if listsubrepos: | |
1569 | for subpath, sub in scmutil.itersubrepos(ctx1, ctx2): |
|
1569 | for subpath, sub in scmutil.itersubrepos(ctx1, ctx2): |
General Comments 0
You need to be logged in to leave comments.
Login now