Mercurial > hg-stable
changeset 41607:7e09ffb3170d
tests: demonstrate broken unshelve when backing up untracked file
Differential Revision: https://phab.mercurial-scm.org/D5850
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 04 Feb 2019 09:21:40 -0800 |
| parents | 59025c9b3540 |
| children | 8785188d1915 |
| files | tests/test-shelve2.t |
| diffstat | 1 files changed, 24 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-shelve2.t Wed Feb 06 15:35:25 2019 -0800 +++ b/tests/test-shelve2.t Mon Feb 04 09:21:40 2019 -0800 @@ -130,13 +130,36 @@ e $ cat e.orig 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 preparing: - $ rm *.orig + $ rm -f *.orig $ hg ci -qm 'commit stuff' $ hg phase -p null: