Mercurial > public > mercurial-scm > hg-stable

diff mercurial/shelve.py @ 48614:bcc4820242cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
shelve: attempt to make merge labels more helpful Differential Revision: https://phab.mercurial-scm.org/D12024
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 21 Jan 2022 13:49:11 -0800
parents 6ecd0980d7f9
children 6000f5b25c9b
line wrap: on
line diff
--- a/mercurial/shelve.py	Fri Jan 21 13:48:18 2022 -0800
+++ b/mercurial/shelve.py	Fri Jan 21 13:49:11 2022 -0800
@@ -1000,7 +1000,11 @@
         stats = merge.graft(
             repo,
             shelvectx,
-            labels=[b'working-copy', b'shelve'],
+            labels=[
+                b'working-copy',
+                b'shelved change',
+                b'parent of shelved change',
+            ],
             keepconflictparent=True,
         )
         if stats.unresolvedcount: