This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5850

tests: demonstrate broken unshelve when backing up untracked file
ClosedPublic

Authored by martinvonz on Feb 5 2019, 12:52 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG7e09ffb3170d: tests: demonstrate broken unshelve when backing up untracked file

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

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

Diff 13855

tests/test-shelve2.t

0 files updated, 0 files merged, 2 files removed, 0 files unresolved 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ echo z > e $ echo z > e
$ hg unshelve $ hg unshelve
unshelving change 'default' unshelving change 'default'
$ cat e $ cat e
e e
$ cat e.orig $ cat e.orig
z z
$ rm e.orig
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 unshelve and conflicts with tracked and untracked files
preparing: preparing:
$ rm *.orig $ rm -f *.orig
$ hg ci -qm 'commit stuff' $ hg ci -qm 'commit stuff'
$ hg phase -p null: $ hg phase -p null:
no other changes - no merge: no other changes - no merge:
$ echo f > f $ echo f > f
$ hg add f $ hg add f
$ hg shelve $ hg shelve