Show More
@@ -2650,9 +2650,9 b' def status(ui, repo, *pats, **opts):' | |||||
2650 | if node2 is None: |
|
2650 | if node2 is None: | |
2651 | ctx2 = repo.workingctx() |
|
2651 | ctx2 = repo.workingctx() | |
2652 | for k, v in copies.copies(repo, ctx1, ctx2, ctxn)[0].items(): |
|
2652 | for k, v in copies.copies(repo, ctx1, ctx2, ctxn)[0].items(): | |
2653 |
if v in stat |
|
2653 | if v in stat[1]: | |
2654 | copy[v] = k |
|
2654 | copy[v] = k | |
2655 |
elif k in stat |
|
2655 | elif k in stat[1]: | |
2656 | copy[k] = v |
|
2656 | copy[k] = v | |
2657 |
|
2657 | |||
2658 | for state, char, files in changestates: |
|
2658 | for state, char, files in changestates: |
General Comments 0
You need to be logged in to leave comments.
Login now