Show More
@@ -5604,7 +5604,9 b' def resolve(ui, repo, *pats, **opts):' | |||||
5604 | raise error.Abort( |
|
5604 | raise error.Abort( | |
5605 | _('resolve command not applicable when not merging')) |
|
5605 | _('resolve command not applicable when not merging')) | |
5606 |
|
5606 | |||
5607 | m = scmutil.match(repo[None], pats, opts) |
|
5607 | wctx = repo[None] | |
|
5608 | ||||
|
5609 | m = scmutil.match(wctx, pats, opts) | |||
5608 | ret = 0 |
|
5610 | ret = 0 | |
5609 | didwork = False |
|
5611 | didwork = False | |
5610 |
|
5612 | |||
@@ -5620,8 +5622,6 b' def resolve(ui, repo, *pats, **opts):' | |||||
5620 | elif unmark: |
|
5622 | elif unmark: | |
5621 | ms.mark(f, "u") |
|
5623 | ms.mark(f, "u") | |
5622 | else: |
|
5624 | else: | |
5623 | wctx = repo[None] |
|
|||
5624 |
|
||||
5625 | # backup pre-resolve (merge uses .orig for its own purposes) |
|
5625 | # backup pre-resolve (merge uses .orig for its own purposes) | |
5626 | a = repo.wjoin(f) |
|
5626 | a = repo.wjoin(f) | |
5627 | util.copyfile(a, a + ".resolve") |
|
5627 | util.copyfile(a, a + ".resolve") |
General Comments 0
You need to be logged in to leave comments.
Login now