equal
deleted
inserted
replaced
5602 |
5602 |
5603 if not (ms.active() or repo.dirstate.p2() != nullid): |
5603 if not (ms.active() or repo.dirstate.p2() != nullid): |
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 |
5611 tocomplete = [] |
5613 tocomplete = [] |
5612 for f in ms: |
5614 for f in ms: |
5618 if mark: |
5620 if mark: |
5619 ms.mark(f, "r") |
5621 ms.mark(f, "r") |
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") |
5628 |
5628 |
5629 try: |
5629 try: |