Mercurial > hg
changeset 30271:0fa1a41d04e4
rebase: rename merge to mergemod
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Wed, 02 Nov 2016 18:56:07 +0000 |
| parents | e25ce44f8447 |
| children | 3d38a0bc774f |
| files | hgext/rebase.py |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/rebase.py Thu Mar 19 22:22:50 2015 +0100 +++ b/hgext/rebase.py Wed Nov 02 18:56:07 2016 +0000 @@ -36,7 +36,7 @@ extensions, hg, lock, - merge, + merge as mergemod, obsolete, patch, phases, @@ -823,7 +823,7 @@ # Update to target and merge it with local if repo['.'].rev() != p1: repo.ui.debug(" update to %d:%s\n" % (p1, repo[p1])) - merge.update(repo, p1, False, True) + mergemod.update(repo, p1, False, True) else: repo.ui.debug(" already in target\n") repo.dirstate.write(repo.currenttransaction()) @@ -832,8 +832,8 @@ repo.ui.debug(" detach base %d:%s\n" % (base, repo[base])) # When collapsing in-place, the parent is the common ancestor, we # have to allow merging with it. - stats = merge.update(repo, rev, True, True, base, collapse, - labels=['dest', 'source']) + stats = mergemod.update(repo, rev, True, True, base, collapse, + labels=['dest', 'source']) if collapse: copies.duplicatecopies(repo, rev, target) else: @@ -1150,7 +1150,7 @@ # Update away from the rebase if necessary if shouldupdate or needupdate(repo, state): - merge.update(repo, originalwd, False, True) + mergemod.update(repo, originalwd, False, True) # Strip from the first rebased revision if rebased: