# HG changeset patch # User Boris Feld <boris.f...@octobus.net> # Date 1527545744 -7200 # Tue May 29 00:15:44 2018 +0200 # Node ID 0093905b9797a6f76730cd37a45a6f1b843c5b03 # Parent 98b3fa1f58c8da86a7d12faf4881bf3014637066 # EXP-Topic graftshelve # Available At https://bitbucket.org/octobus/mercurial-devel/ # hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 0093905b9797 shelve: stop testing missing rebase state file
We no longer use the file. Neither during rebase not during continue. Differential Revision: https://phab.mercurial-scm.org/D3691 diff --git a/tests/test-shelve.t b/tests/test-shelve.t --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -1262,29 +1262,17 @@ test .orig files go where the user wants 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 -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' - unshelve of 'default-01' aborted + unshelve of 'default' aborted $ 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 . _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel