Show More
@@ -14,7 +14,7 b' import patch, help, url, encoding, templ' | |||
|
14 | 14 | import archival, changegroup, cmdutil, hbisect |
|
15 | 15 | import sshserver, hgweb, hgweb.server, commandserver |
|
16 | 16 | import match as matchmod |
|
17 | import merge | |
|
17 | import merge as mergemod | |
|
18 | 18 | import minirst, revset, fileset |
|
19 | 19 | import dagparser, context, simplemerge |
|
20 | 20 | import random, setdiscovery, treediscovery, dagutil |
@@ -2623,7 +2623,7 b' def graft(ui, repo, *revs, **opts):' | |||
|
2623 | 2623 | try: |
|
2624 | 2624 | # ui.forcemerge is an internal variable, do not document |
|
2625 | 2625 | repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) |
|
2626 | stats = merge.update(repo, ctx.node(), True, True, False, | |
|
2626 | stats = mergemod.update(repo, ctx.node(), True, True, False, | |
|
2627 | 2627 | ctx.p1().node()) |
|
2628 | 2628 | finally: |
|
2629 | 2629 | ui.setconfig('ui', 'forcemerge', '') |
@@ -4655,7 +4655,7 b' def resolve(ui, repo, *pats, **opts):' | |||
|
4655 | 4655 | raise util.Abort(_('no files or directories specified; ' |
|
4656 | 4656 | 'use --all to remerge all files')) |
|
4657 | 4657 | |
|
4658 | ms = merge.mergestate(repo) | |
|
4658 | ms = mergemod.mergestate(repo) | |
|
4659 | 4659 | m = scmutil.match(repo[None], pats, opts) |
|
4660 | 4660 | ret = 0 |
|
4661 | 4661 | |
@@ -5352,7 +5352,7 b' def summary(ui, repo, **opts):' | |||
|
5352 | 5352 | st.insert(3, renamed) |
|
5353 | 5353 | st.insert(4, copied) |
|
5354 | 5354 | |
|
5355 | ms = merge.mergestate(repo) | |
|
5355 | ms = mergemod.mergestate(repo) | |
|
5356 | 5356 | st.append([f for f in ms if ms[f] == 'u']) |
|
5357 | 5357 | |
|
5358 | 5358 | subs = [s for s in ctx.substate if ctx.sub(s).dirty()] |
General Comments 0
You need to be logged in to leave comments.
Login now