Mercurial > hg-stable
changeset 38468: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 |
| files | tests/test-shelve.t |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-shelve.t Tue May 29 00:13:48 2018 +0200 +++ b/tests/test-shelve.t Tue May 29 00:12:35 2018 +0200 @@ -1277,7 +1277,7 @@ unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') [1] $ sed 's/ae8c668541e8/123456789012/' .hg/shelvedstate > ../corrupt-shelvedstate - $ mv ../corrupt-shelvedstate .hg/histedit-state + $ mv ../corrupt-shelvedstate .hg/shelvestate $ hg unshelve --abort 2>&1 | grep 'aborted' unshelve of 'default-01' aborted $ hg summary