Mercurial > public > mercurial-scm > hg-stable
diff 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 |
line wrap: on
line diff
--- a/mercurial/commands.py Sat Dec 12 09:57:05 2015 -0800 +++ b/mercurial/commands.py Mon Dec 14 18:54:03 2015 -0500 @@ -636,8 +636,7 @@ try: ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'backout') - stats = mergemod.update(repo, parent, True, True, False, - node, False) + stats = mergemod.update(repo, parent, True, True, node, False) repo.setparents(op1, op2) dsguard.close() hg._showstats(repo, stats)