# HG changeset patch
# User Phil Cohen <phillco@fb.com>
# Date 1512691626 28800
# Node ID 2bac2d836ce004c69e1dabab78bd086111586f48
# Parent  5c25fe7fb1e63a31ed082dfcb93673fa79cf081f
rebase: pass the wctx object (IMM or on-disk) to merge.update

Differential Revision: https://phab.mercurial-scm.org/D1247

diff -r 5c25fe7fb1e6 -r 2bac2d836ce0 hgext/rebase.py
--- a/hgext/rebase.py	Thu Dec 07 16:07:06 2017 -0800
+++ b/hgext/rebase.py	Thu Dec 07 16:07:06 2017 -0800
@@ -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: