diff --git a/tests/test-shelve.t b/tests/test-shelve.t index 920f69c0b549ba73c5141dda2f185ab3c472f425_dGVzdHMvdGVzdC1zaGVsdmUudA==..a8f99334ae31ea28ea7ae2ec6564dacf250f935e_dGVzdHMvdGVzdC1zaGVsdmUudA== 100644 --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -1262,8 +1262,4 @@ test Abort unshelve always gets user out of the unshelved state --------------------------------------------------------------- -Wreak havoc on the unshelve process - $ rm .hg/unshelverebasestate - $ hg unshelve --abort - unshelve of 'default' aborted @@ -1269,13 +1265,5 @@ -Try again but with a corrupted shelve state file - $ hg up -r 0 -q - $ echo '' > root - $ hg shelve -q - $ echo 'contADDent' > root - $ hg unshelve -q - warning: conflicts while merging root! (edit, then use 'hg resolve --mark') - unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') - [1] +with a corrupted shelve state file $ sed 's/ae8c668541e8/123456789012/' .hg/shelvedstate > ../corrupt-shelvedstate $ mv ../corrupt-shelvedstate .hg/shelvestate $ hg unshelve --abort 2>&1 | grep 'aborted' @@ -1279,8 +1267,8 @@ $ sed 's/ae8c668541e8/123456789012/' .hg/shelvedstate > ../corrupt-shelvedstate $ mv ../corrupt-shelvedstate .hg/shelvestate $ hg unshelve --abort 2>&1 | grep 'aborted' - unshelve of 'default-01' aborted + unshelve of 'default' aborted $ hg summary parent: 0:ae8c668541e8 tip root branch: default @@ -1283,8 +1271,8 @@ $ hg summary parent: 0:ae8c668541e8 tip root branch: default - commit: 1 modified, 1 unknown + commit: 1 modified update: (current) phases: 1 draft $ hg up -C .