Mercurial > public > mercurial-scm > hg

diff mercurial/shelve.py @ 44212:cb8b67016110

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
graft: default `base` argument to common case of `ctx.p1()` I also updated the callers that wanted that, partly to simplify and partly to show that it works. Differential Revision: https://phab.mercurial-scm.org/D8027
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 28 Jan 2020 14:53:23 -0800
parents 414cb20e241e
children f546d2170b0f
line wrap: on
line diff
--- a/mercurial/shelve.py	Fri Jan 10 13:12:24 2020 -0800
+++ b/mercurial/shelve.py	Tue Jan 28 14:53:23 2020 -0800
@@ -996,7 +996,6 @@
         stats = merge.graft(
             repo,
             shelvectx,
-            shelvectx.p1(),
             labels=[b'shelve', b'working-copy'],
             keepconflictparent=True,
         )