Mercurial > hg
changeset 35318:2bac2d836ce0
rebase: pass the wctx object (IMM or on-disk) to merge.update
Differential Revision: https://phab.mercurial-scm.org/D1247
| author | Phil Cohen <phillco@fb.com> |
|---|---|
| date | Thu, 07 Dec 2017 16:07:06 -0800 |
| parents | 5c25fe7fb1e6 |
| children | 228916ca12b5 |
| files | hgext/rebase.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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: