Submitter | phabricator |
---|---|
Date | Dec. 7, 2017, 9:23 p.m. |
Message ID | <8ed64a12e5e15b100925041c952ffaea@localhost.localdomain> |
Download | mbox | patch |
Permalink | /patch/26027/ |
State | Not Applicable |
Headers | show |
Comments
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: