Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgext/rebase.py
changeset 35318 2bac2d836ce0
parent 35317 5c25fe7fb1e6
child 35319 228916ca12b5 
--- 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:
Mercurial