Mercurial > hg
comparison mercurial/commands.py @ 27344:43c00ca887d1
merge: have merge.update use a matcher instead of partial fn
This is relatively rarely used functionality, but migrating this to a
matcher will make future work on narrow clones more feasible.
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Mon, 14 Dec 2015 18:54:03 -0500 |
| parents | 944af8e2eb4c |
| children | 9fd8f1552369 |
comparison
equal
deleted
inserted
replaced
| 27343:c59647c6694d | 27344:43c00ca887d1 |
|---|---|
| 634 if not opts.get('merge') and op1 != node: | 634 if not opts.get('merge') and op1 != node: |
| 635 dsguard = cmdutil.dirstateguard(repo, 'backout') | 635 dsguard = cmdutil.dirstateguard(repo, 'backout') |
| 636 try: | 636 try: |
| 637 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), | 637 ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), |
| 638 'backout') | 638 'backout') |
| 639 stats = mergemod.update(repo, parent, True, True, False, | 639 stats = mergemod.update(repo, parent, True, True, node, False) |
| 640 node, False) | |
| 641 repo.setparents(op1, op2) | 640 repo.setparents(op1, op2) |
| 642 dsguard.close() | 641 dsguard.close() |
| 643 hg._showstats(repo, stats) | 642 hg._showstats(repo, stats) |
| 644 if stats[3]: | 643 if stats[3]: |
| 645 repo.ui.status(_("use 'hg resolve' to retry unresolved " | 644 repo.ui.status(_("use 'hg resolve' to retry unresolved " |