# HG changeset patch # User Boris Feld # Date 2018-05-28 22:12:35 # Node ID 920f69c0b549ba73c5141dda2f185ab3c472f425 # Parent f4776f8b98e0a861d548664bf2d93f6af677cb65 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 diff --git a/tests/test-shelve.t b/tests/test-shelve.t --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -1277,7 +1277,7 @@ Try again but with a corrupted shelve st 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