D12024: shelve: attempt to make merge labels more helpful
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Fri Jan 21 23:37:21 UTC 2022
martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D12024
AFFECTED FILES
mercurial/shelve.py
tests/test-shelve.t
tests/test-shelve2.t
CHANGE DETAILS
diff --git a/tests/test-shelve2.t b/tests/test-shelve2.t
--- a/tests/test-shelve2.t
+++ b/tests/test-shelve2.t
@@ -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 ..
diff --git a/tests/test-shelve.t b/tests/test-shelve.t
--- a/tests/test-shelve.t
+++ b/tests/test-shelve.t
@@ -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
diff --git a/mercurial/shelve.py b/mercurial/shelve.py
--- 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:
To: martinvonz, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
More information about the Mercurial-devel
mailing list