Mercurial > hg
comparison tests/test-shelve.t @ 38464:920f69c0b549
shelve: actually test corrupted shelve state
The test was previous moving the corrupted shelve state file as an histedit
state file.
Differential Revision: https://phab.mercurial-scm.org/D3690
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Tue, 29 May 2018 00:12:35 +0200 |
| parents | f4776f8b98e0 |
| children | a8f99334ae31 |
comparison
equal
deleted
inserted
replaced
| 38463:f4776f8b98e0 | 38464:920f69c0b549 |
|---|---|
| 1275 $ hg unshelve -q | 1275 $ hg unshelve -q |
| 1276 warning: conflicts while merging root! (edit, then use 'hg resolve --mark') | 1276 warning: conflicts while merging root! (edit, then use 'hg resolve --mark') |
| 1277 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') | 1277 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
| 1278 [1] | 1278 [1] |
| 1279 $ sed 's/ae8c668541e8/123456789012/' .hg/shelvedstate > ../corrupt-shelvedstate | 1279 $ sed 's/ae8c668541e8/123456789012/' .hg/shelvedstate > ../corrupt-shelvedstate |
| 1280 $ mv ../corrupt-shelvedstate .hg/histedit-state | 1280 $ mv ../corrupt-shelvedstate .hg/shelvestate |
| 1281 $ hg unshelve --abort 2>&1 | grep 'aborted' | 1281 $ hg unshelve --abort 2>&1 | grep 'aborted' |
| 1282 unshelve of 'default-01' aborted | 1282 unshelve of 'default-01' aborted |
| 1283 $ hg summary | 1283 $ hg summary |
| 1284 parent: 0:ae8c668541e8 tip | 1284 parent: 0:ae8c668541e8 tip |
| 1285 root | 1285 root |