Skip to content
Snippets Groups Projects
Commit 2527c10a2569 authored by Kyle Lippincott's avatar Kyle Lippincott
Browse files

shelve: add test clearly demonstrating that the conflict labels are backwards

Differential Revision: https://phab.mercurial-scm.org/D8139
parent b339faf3f843
No related branches found
No related tags found
No related merge requests found
......@@ -921,3 +921,25 @@
@ initial commit test 1970-01-01 00:00 +0000
$ cd ..
Demonstrate that the labels are correct in the merge conflict
-------------------------------------------------------------
$ hg init labels
$ cd labels
$ echo r0 > foo
$ hg ci -qAm r0
$ echo "this will be shelved" >> foo
$ hg shelve -q
$ echo "this is in wdir, conflicts with shelve" >> foo
$ hg unshelve -q
warning: conflicts while merging foo! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1]
$ cat foo
r0
<<<<<<< shelve: 0b2fcf2a90e9 - shelve: pending changes temporary commit
this is in wdir, conflicts with shelve
=======
this will be shelved
>>>>>>> working-copy: 9c072a2163db - shelve: changes to: r0
$ cd ..
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment