D1247: rebase: pass the wctx object (IMM or on-disk) to merge.update
phillco (Phil Cohen)
phabricator at mercurial-scm.org
Fri Dec 8 15:28:42 EST 2017
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG2bac2d836ce0: rebase: pass the wctx object (IMM or on-disk) to merge.update (authored by phillco, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D1247?vs=4212&id=4264
REVISION DETAIL
https://phab.mercurial-scm.org/D1247
AFFECTED FILES
hgext/rebase.py
CHANGE DETAILS
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -1017,7 +1017,7 @@
# When collapsing in-place, the parent is the common ancestor, we
# have to allow merging with it.
stats = mergemod.update(repo, rev, True, True, base, collapse,
- labels=['dest', 'source'])
+ labels=['dest', 'source'], wc=wctx)
if collapse:
copies.duplicatecopies(repo, wctx, rev, dest)
else:
To: phillco, #hg-reviewers, durin42
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list