Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
shelve: attempt to make merge labels more helpful
authorMartin von Zweigbergk <martinvonz@google.com>
Fri, 21 Jan 2022 13:49:11 -0800
changeset 48592 bcc4820242cf
parent 48591 f1162b125991
child 48593 47b3fca301f8
shelve: attempt to make merge labels more helpful Differential Revision: https://phab.mercurial-scm.org/D12024
mercurial/shelve.py file | annotate | diff | comparison | revisions
tests/test-shelve.t file | annotate | diff | comparison | revisions
tests/test-shelve2.t file | annotate | diff | comparison | revisions 
--- 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:
--- a/tests/test-shelve.t	Fri Jan 21 13:48:18 2022 -0800
+++ b/tests/test-shelve.t	Fri Jan 21 13:49:11 2022 -0800
@@ -419,11 +419,11 @@
   +++ b/a/a
   @@ -1,2 +1,6 @@
    a
-  +<<<<<<< working-copy: 2377350b6337 - shelve: pending changes temporary commit
+  +<<<<<<< working-copy:   2377350b6337 - shelve: pending changes temporary commit
    c
   +=======
   +a
-  +>>>>>>> shelve:       203c9f771d2b - shelve: changes to: [mq]: second.patch
+  +>>>>>>> shelved change: 203c9f771d2b - shelve: changes to: [mq]: second.patch
   diff --git a/b/b b/b.rename/b
   rename from b/b
   rename to b.rename/b
--- a/tests/test-shelve2.t	Fri Jan 21 13:48:18 2022 -0800
+++ b/tests/test-shelve2.t	Fri Jan 21 13:49:11 2022 -0800
@@ -253,11 +253,11 @@
   M f
   ? f.orig
   $ cat f
-  <<<<<<< working-copy: d44eae5c3d33 - shelve: pending changes temporary commit
+  <<<<<<< working-copy:   d44eae5c3d33 - shelve: pending changes temporary commit
   g
   =======
   f
-  >>>>>>> shelve:       aef214a5229c - shelve: changes to: commit stuff
+  >>>>>>> shelved change: aef214a5229c - shelve: changes to: commit stuff
   $ cat f.orig
   g
   $ hg unshelve --abort -t false
@@ -295,11 +295,11 @@
   M f
   ? f.orig
   $ cat f
-  <<<<<<< working-copy: 6b563750f973 - test: intermediate other change
+  <<<<<<< working-copy:   6b563750f973 - test: intermediate other change
   g
   =======
   f
-  >>>>>>> shelve:       aef214a5229c - shelve: changes to: commit stuff
+  >>>>>>> shelved change: aef214a5229c - shelve: changes to: commit stuff
   $ cat f.orig
   g
 
@@ -986,9 +986,9 @@
   [240]
   $ cat foo
   r0
-  <<<<<<< working-copy: 0b2fcf2a90e9 - shelve: pending changes temporary commit
+  <<<<<<< working-copy:   0b2fcf2a90e9 - shelve: pending changes temporary commit
   this is in wdir, conflicts with shelve
   =======
   this will be shelved
-  >>>>>>> shelve:       9c072a2163db - shelve: changes to: r0
+  >>>>>>> shelved change: 9c072a2163db - shelve: changes to: r0
   $ cd ..
Mercurial