Skip to content
Snippets Groups Projects
Commit 7e09ffb3170d authored by Martin von Zweigbergk's avatar Martin von Zweigbergk
Browse files

tests: demonstrate broken unshelve when backing up untracked file

Differential Revision: https://phab.mercurial-scm.org/D5850
parent 59025c9b3540
No related branches found
No related tags found
No related merge requests found
......@@ -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:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment