equal
deleted
inserted
replaced
100 make sure shelve files were backed up |
100 make sure shelve files were backed up |
101 |
101 |
102 $ ls .hg/shelve-backup |
102 $ ls .hg/shelve-backup |
103 default.hg |
103 default.hg |
104 default.patch |
104 default.patch |
|
105 default.shelve |
105 |
106 |
106 checks to make sure we dont create a directory or |
107 checks to make sure we dont create a directory or |
107 hidden file while choosing a new shelve name |
108 hidden file while choosing a new shelve name |
108 |
109 |
109 when we are given a name |
110 when we are given a name |
204 ensure shelve backups aren't overwritten |
205 ensure shelve backups aren't overwritten |
205 |
206 |
206 $ ls .hg/shelve-backup/ |
207 $ ls .hg/shelve-backup/ |
207 default-1.hg |
208 default-1.hg |
208 default-1.patch |
209 default-1.patch |
|
210 default-1.shelve |
209 default.hg |
211 default.hg |
210 default.patch |
212 default.patch |
|
213 default.shelve |
211 |
214 |
212 local edits should not prevent a shelved change from applying |
215 local edits should not prevent a shelved change from applying |
213 |
216 |
214 $ printf "z\na\n" > a/a |
217 $ printf "z\na\n" > a/a |
215 $ hg unshelve --keep |
218 $ hg unshelve --keep |
248 is difficult to decide actual order of them from same timestamp) |
251 is difficult to decide actual order of them from same timestamp) |
249 |
252 |
250 $ ls .hg/shelve-backup/ |
253 $ ls .hg/shelve-backup/ |
251 default-01.hg |
254 default-01.hg |
252 default-01.patch |
255 default-01.patch |
|
256 default-01.shelve |
253 default-1.hg |
257 default-1.hg |
254 default-1.patch |
258 default-1.patch |
|
259 default-1.shelve |
255 default.hg |
260 default.hg |
256 default.patch |
261 default.patch |
|
262 default.shelve |
257 |
263 |
258 $ hg unshelve |
264 $ hg unshelve |
259 abort: no shelved changes to apply! |
265 abort: no shelved changes to apply! |
260 [255] |
266 [255] |
261 $ hg unshelve foo |
267 $ hg unshelve foo |
312 ensure old shelve backups are being deleted automatically |
318 ensure old shelve backups are being deleted automatically |
313 |
319 |
314 $ ls .hg/shelve-backup/ |
320 $ ls .hg/shelve-backup/ |
315 default-01.hg |
321 default-01.hg |
316 default-01.patch |
322 default-01.patch |
|
323 default-01.shelve |
317 wibble.hg |
324 wibble.hg |
318 wibble.patch |
325 wibble.patch |
|
326 wibble.shelve |
319 |
327 |
320 cause unshelving to result in a merge with 'a' conflicting |
328 cause unshelving to result in a merge with 'a' conflicting |
321 |
329 |
322 $ hg shelve -q |
330 $ hg shelve -q |
323 $ echo c>>a/a |
331 $ echo c>>a/a |