diff --git a/mercurial/shelve.py b/mercurial/shelve.py index f1162b1259919b19227ac22beda375731acff4ce_bWVyY3VyaWFsL3NoZWx2ZS5weQ==..bcc4820242cfedd290468a6b7f193b860ffee208_bWVyY3VyaWFsL3NoZWx2ZS5weQ== 100644 --- a/mercurial/shelve.py +++ b/mercurial/shelve.py @@ -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: diff --git a/tests/test-shelve.t b/tests/test-shelve.t index f1162b1259919b19227ac22beda375731acff4ce_dGVzdHMvdGVzdC1zaGVsdmUudA==..bcc4820242cfedd290468a6b7f193b860ffee208_dGVzdHMvdGVzdC1zaGVsdmUudA== 100644 --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -419,7 +419,7 @@ +++ 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 @@ -423,7 +423,7 @@ 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 diff --git a/tests/test-shelve2.t b/tests/test-shelve2.t index f1162b1259919b19227ac22beda375731acff4ce_dGVzdHMvdGVzdC1zaGVsdmUyLnQ=..bcc4820242cfedd290468a6b7f193b860ffee208_dGVzdHMvdGVzdC1zaGVsdmUyLnQ= 100644 --- a/tests/test-shelve2.t +++ b/tests/test-shelve2.t @@ -253,7 +253,7 @@ M f ? f.orig $ cat f - <<<<<<< working-copy: d44eae5c3d33 - shelve: pending changes temporary commit + <<<<<<< working-copy: d44eae5c3d33 - shelve: pending changes temporary commit g ======= f @@ -257,7 +257,7 @@ 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,7 +295,7 @@ M f ? f.orig $ cat f - <<<<<<< working-copy: 6b563750f973 - test: intermediate other change + <<<<<<< working-copy: 6b563750f973 - test: intermediate other change g ======= f @@ -299,7 +299,7 @@ g ======= f - >>>>>>> shelve: aef214a5229c - shelve: changes to: commit stuff + >>>>>>> shelved change: aef214a5229c - shelve: changes to: commit stuff $ cat f.orig g @@ -986,7 +986,7 @@ [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 @@ -990,5 +990,5 @@ 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 ..