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

login
register
mail settings
Submitter phabricator
Date Feb. 21, 2020, 1:13 a.m.
Message ID <differential-rev-PHID-DREV-txse642leybxpnqzys2y-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/45278/
State Superseded
Headers show

Comments

phabricator - Feb. 21, 2020, 1:13 a.m.
spectral created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D8139

AFFECTED FILES
  tests/test-shelve2.t

CHANGE DETAILS




To: spectral, #hg-reviewers
Cc: mercurial-devel
phabricator - Feb. 21, 2020, 8:47 a.m.
marmoute added a comment.
marmoute accepted this revision.


  This patch seem (embarrassedly) right.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8139/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D8139

To: spectral, #hg-reviewers, marmoute
Cc: marmoute, mercurial-devel
phabricator - Feb. 21, 2020, 9:02 a.m.
pulkit added a comment.


  This fails to apply on tip of stable branch. Kindly rebase and resend.

REPOSITORY
  rHG Mercurial

BRANCH
  default

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D8139/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D8139

To: spectral, #hg-reviewers, marmoute, pulkit
Cc: marmoute, mercurial-devel

Patch

diff --git a/tests/test-shelve2.t b/tests/test-shelve2.t
--- a/tests/test-shelve2.t
+++ b/tests/test-shelve2.t
@@ -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 ..