D1247: rebase: pass the wctx object (IMM or on-disk) to merge.update

phillco (Phil Cohen) phabricator at mercurial-scm.org
Thu Dec 7 16:23:29 EST 2017


phillco updated this revision to Diff 4193.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1247?vs=3120&id=4193

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
Cc: mercurial-devel


More information about the Mercurial-devel mailing list