This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8139

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

Authored by spectral on Feb 20 2020, 8:12 PM.

Details

Reviewers
marmoute
pulkit
Group Reviewers
hg-reviewers
Commits
rHG2527c10a2569: shelve: add test clearly demonstrating that the conflict labels are backwards

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

spectral created this revision.Feb 20 2020, 8:12 PM
marmoute accepted this revision.Feb 21 2020, 3:47 AM
marmoute added a subscriber: marmoute.

This patch seem (embarrassedly) right.

pulkit accepted this revision.Feb 21 2020, 3:54 AM
This revision is now accepted and ready to land.Feb 21 2020, 3:54 AM
pulkit added a comment.Feb 21 2020, 4:02 AM

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

Revision Contents
Changeset List

PathPackages
Mtests/test-shelve2.t (22 lines)

Diff 20274

tests/test-shelve2.t

$ hg unshelve --abort $ hg unshelve --abort
unshelve of 'default' aborted unshelve of 'default' aborted
$ hg log -G --template '{desc|firstline} {author} {date|isodate} \n' -r . $ hg log -G --template '{desc|firstline} {author} {date|isodate} \n' -r .
@ initial commit test 1970-01-01 00:00 +0000 @ initial commit test 1970-01-01 00:00 +0000
$ cd .. $ 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 ..