changeset 44185:2527c10a2569 stable

shelve: add test clearly demonstrating that the conflict labels are backwards Differential Revision: https://phab.mercurial-scm.org/D8139
author Kyle Lippincott <spectral@google.com>
date Thu, 20 Feb 2020 17:06:01 -0800
parents b339faf3f843
children 69b091cdc506
files tests/test-shelve2.t
diffstat 1 files changed, 22 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-shelve2.t	Sun Feb 16 17:05:18 2020 -0500
+++ b/tests/test-shelve2.t	Thu Feb 20 17:06:01 2020 -0800
@@ -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 ..