Mercurial > hg
diff tests/test-shelve2.t @ 41596:630af04d4ae4
shelve: fix broken backup of conflicting untracked file
Differential Revision: https://phab.mercurial-scm.org/D5852
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 04 Feb 2019 20:49:45 -0800 |
parents | 7e09ffb3170d |
children | 3de4f17f4824 |
line wrap: on
line diff
--- a/tests/test-shelve2.t Mon Feb 04 20:46:33 2019 -0800 +++ b/tests/test-shelve2.t Mon Feb 04 20:49:45 2019 -0800 @@ -139,21 +139,13 @@ 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 + e + $ cat e.orig 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