##// END OF EJS Templates
tests: demonstrate broken unshelve when backing up untracked file...
Martin von Zweigbergk -
r41734:7e09ffb3 default
parent child Browse files
Show More
@@ -130,13 +130,36 b' unshelve should keep a copy of unknown f'
130 e
130 e
131 $ cat e.orig
131 $ cat e.orig
132 z
132 z
133 $ rm e.orig
133
134
135 restores backup of unknown file to right directory
136
137 $ hg shelve
138 shelved as default
139 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
140 $ echo z > e
141 $ mkdir dir
142 BROKEN: should work the same as when not using --cwd
143 $ hg unshelve --cwd dir
144 unshelving change 'default'
145 abort: $ENOENT$
146 [255]
147 $ rmdir dir
148 $ cat e
149 z
150 $ test -f e.orig && cat e.orig
151 [1]
152 restore broken state
153 $ touch d
154 $ echo e > e
155 $ hg add d e
156 $ hg shelve --delete default
134
157
135 unshelve and conflicts with tracked and untracked files
158 unshelve and conflicts with tracked and untracked files
136
159
137 preparing:
160 preparing:
138
161
139 $ rm *.orig
162 $ rm -f *.orig
140 $ hg ci -qm 'commit stuff'
163 $ hg ci -qm 'commit stuff'
141 $ hg phase -p null:
164 $ hg phase -p null:
142
165
General Comments 0
You need to be logged in to leave comments. Login now