Mercurial > hg-stable
comparison mercurial/commands.py @ 20595:710c2755e66a
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 27 Feb 2014 18:57:03 -0600 |
| parents | e0e223b0a506 ba619c50a355 |
| children | a3ca1d032926 |
comparison
equal
deleted
inserted
replaced
| 20587:cb18fe3461b1 | 20595:710c2755e66a |
|---|---|
| 4952 ms.mark(f, "r") | 4952 ms.mark(f, "r") |
| 4953 elif unmark: | 4953 elif unmark: |
| 4954 ms.mark(f, "u") | 4954 ms.mark(f, "u") |
| 4955 else: | 4955 else: |
| 4956 wctx = repo[None] | 4956 wctx = repo[None] |
| 4957 mctx = wctx.parents()[-1] | |
| 4958 | 4957 |
| 4959 # backup pre-resolve (merge uses .orig for its own purposes) | 4958 # backup pre-resolve (merge uses .orig for its own purposes) |
| 4960 a = repo.wjoin(f) | 4959 a = repo.wjoin(f) |
| 4961 util.copyfile(a, a + ".resolve") | 4960 util.copyfile(a, a + ".resolve") |
| 4962 | 4961 |
| 4963 try: | 4962 try: |
| 4964 # resolve file | 4963 # resolve file |
| 4965 ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) | 4964 ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) |
| 4966 if ms.resolve(f, wctx, mctx): | 4965 if ms.resolve(f, wctx): |
| 4967 ret = 1 | 4966 ret = 1 |
| 4968 finally: | 4967 finally: |
| 4969 ui.setconfig('ui', 'forcemerge', '') | 4968 ui.setconfig('ui', 'forcemerge', '') |
| 4970 ms.commit() | 4969 ms.commit() |
| 4971 | 4970 |