Patchwork D5850: tests: demonstrate broken unshelve when backing up untracked file

login
register
mail settings
Submitter phabricator
Date Feb. 6, 2019, 11:59 p.m.
Message ID <cdb86658958d7c39b51eb36971529c5a@localhost.localdomain>
Download mbox | patch
Permalink /patch/38485/
State Not Applicable
Headers show

Comments

phabricator - Feb. 6, 2019, 11:59 p.m.
martinvonz updated this revision to Diff 13855.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D5850?vs=13814&id=13855

REVISION DETAIL
  https://phab.mercurial-scm.org/D5850

AFFECTED FILES
  tests/test-shelve2.t

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/tests/test-shelve2.t b/tests/test-shelve2.t
--- a/tests/test-shelve2.t
+++ b/tests/test-shelve2.t
@@ -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: