Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
mercurial-devel
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mercurial
mercurial-devel
Commits
2527c10a2569
Commit
2527c10a2569
authored
5 years ago
by
Kyle Lippincott
Browse files
Options
Downloads
Patches
Plain Diff
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
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
tests/test-shelve2.t
+22
-0
22 additions, 0 deletions
tests/test-shelve2.t
with
22 additions
and
0 deletions
tests/test-shelve2.t
+
22
−
0
View file @
2527c10a
...
...
@@ -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:
0
b2fcf2a90e9
-
shelve:
pending
changes
temporary
commit
this
is
in
wdir
,
conflicts
with
shelve
=======
this
will
be
shelved
>>>>>>>
working
-
copy:
9
c072a2163db
-
shelve:
changes
to:
r0
$
cd
..
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment