Mercurial > public > mercurial-scm > hg

diff hgext/rebase.py @ 44051:436d106de670

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
overlayworkginctx: implement a setparents() to mirror dirstate.setparents() This lets us make the in-memory and on-disk code a bit more similar. I'll soon also implement setparents() on the regular workingctx. Differential Revision: https://phab.mercurial-scm.org/D7822
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 10 Jan 2020 21:41:28 -0800
parents 2ecbc4ec87d8
children 894c91c2e363
line wrap: on
line diff
--- a/hgext/rebase.py	Fri Jan 10 17:03:23 2020 -0800
+++ b/hgext/rebase.py	Fri Jan 10 21:41:28 2020 -0800
@@ -1434,9 +1434,9 @@
     if b'branch' in extra:
         branch = extra[b'branch']
 
+    wctx.setparents(repo[p1].node(), repo[p2].node())
     memctx = wctx.tomemctx(
         commitmsg,
-        parents=(p1, p2),
         date=date,
         extra=extra,
         user=user,