shelve: fix ordering of merge labels
Differential Revision: https://phab.mercurial-scm.org/D8140
--- a/mercurial/shelve.py Thu Feb 20 17:06:01 2020 -0800
+++ b/mercurial/shelve.py Thu Feb 20 16:21:00 2020 -0800
@@ -997,7 +997,7 @@
repo,
shelvectx,
shelvectx.p1(),
- labels=[b'shelve', b'working-copy'],
+ labels=[b'working-copy', b'shelve'],
keepconflictparent=True,
)
if stats.unresolvedcount:
--- a/tests/test-shelve.t Thu Feb 20 17:06:01 2020 -0800
+++ b/tests/test-shelve.t Thu Feb 20 16:21:00 2020 -0800
@@ -408,11 +408,11 @@
+++ b/a/a
@@ -1,2 +1,6 @@
a
- +<<<<<<< shelve: 2377350b6337 - shelve: pending changes temporary commit
+ +<<<<<<< working-copy: 2377350b6337 - shelve: pending changes temporary commit
c
+=======
+a
- +>>>>>>> working-copy: a68ec3400638 - shelve: changes to: [mq]: second.patch
+ +>>>>>>> shelve: a68ec3400638 - 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 Thu Feb 20 17:06:01 2020 -0800
+++ b/tests/test-shelve2.t Thu Feb 20 16:21:00 2020 -0800
@@ -253,11 +253,11 @@
M f
? f.orig
$ cat f
- <<<<<<< shelve: d44eae5c3d33 - shelve: pending changes temporary commit
+ <<<<<<< working-copy: d44eae5c3d33 - shelve: pending changes temporary commit
g
=======
f
- >>>>>>> working-copy: aef214a5229c - shelve: changes to: commit stuff
+ >>>>>>> shelve: 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
- <<<<<<< shelve: 6b563750f973 - test: intermediate other change
+ <<<<<<< working-copy: 6b563750f973 - test: intermediate other change
g
=======
f
- >>>>>>> working-copy: aef214a5229c - shelve: changes to: commit stuff
+ >>>>>>> shelve: aef214a5229c - shelve: changes to: commit stuff
$ cat f.orig
g
@@ -937,9 +937,9 @@
[1]
$ cat foo
r0
- <<<<<<< shelve: 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
- >>>>>>> working-copy: 9c072a2163db - shelve: changes to: r0
+ >>>>>>> shelve: 9c072a2163db - shelve: changes to: r0
$ cd ..