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
7e09ffb3170d
Commit
7e09ffb3170d
authored
6 years ago
by
Martin von Zweigbergk
Browse files
Options
Downloads
Patches
Plain Diff
tests: demonstrate broken unshelve when backing up untracked file
Differential Revision:
https://phab.mercurial-scm.org/D5850
parent
59025c9b3540
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
+24
-1
24 additions, 1 deletion
tests/test-shelve2.t
with
24 additions
and
1 deletion
tests/test-shelve2.t
+
24
−
1
View file @
7e09ffb3
...
...
@@ -130,4 +130,5 @@
e
$
cat
e
.
orig
z
$
rm
e
.
orig
...
...
@@ -133,6 +134,28 @@
restores
backup
of
unknown
file
to
right
directory
$
hg
shelve
shelved
as
default
0
files
updated
,
0
files
merged
,
2
files
removed
,
0
files
unresolved
$
echo
z
>
e
$
mkdir
dir
BROKEN:
should
work
the
same
as
when
not
using
--
cwd
$
hg
unshelve
--
cwd
dir
unshelving
change
'
default
'
abort:
$ENOENT
$
[
255
]
$
rmdir
dir
$
cat
e
z
$
test
-
f
e
.
orig
&&
cat
e
.
orig
[
1
]
restore
broken
state
$
touch
d
$
echo
e
>
e
$
hg
add
d
e
$
hg
shelve
--
delete
default
unshelve
and
conflicts
with
tracked
and
untracked
files
preparing:
...
...
@@ -134,9 +157,9 @@
unshelve
and
conflicts
with
tracked
and
untracked
files
preparing:
$
rm
*.
orig
$
rm
-
f
*.
orig
$
hg
ci
-
qm
'
commit stuff
'
$
hg
phase
-
p
null:
...
...
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