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

login
register
mail settings
Submitter phabricator
Date Dec. 8, 2017, 8:28 p.m.
Message ID <3b0a71be03eba8d23ee9042df112cc22@localhost.localdomain>
Download mbox | patch
Permalink /patch/26117/
State Not Applicable
Headers show

Comments

phabricator - Dec. 8, 2017, 8:28 p.m.
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




To: phillco, #hg-reviewers, durin42
Cc: mercurial-devel

Patch

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: