# HG changeset patch # User Boris Feld <boris.f...@octobus.net> # Date 1527519311 -7200 # Mon May 28 16:55:11 2018 +0200 # Node ID 95e65e2850cf1ebf3e741995ef830fd4943308a6 # Parent 40dcb51857e9abd5e9494f3511dcbff2650aa7ef # EXP-Topic graftshelve # Available At https://bitbucket.org/octobus/mercurial-devel/ # hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 95e65e2850cf shelve: wider check for successful abort in test
The test was previously focusing on checking that the "sub-rebase" aborted properly. Since rebase is an implementation details we should also check for other messages. Differential Revision: https://phab.mercurial-scm.org/D3686 diff --git a/tests/test-shelve.t b/tests/test-shelve.t --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -1289,8 +1289,16 @@ Try again but with a corrupted shelve st [1] $ sed 's/ae8c668541e8/123456789012/' .hg/shelvedstate > ../corrupt-shelvedstate $ mv ../corrupt-shelvedstate .hg/histedit-state - $ hg unshelve --abort 2>&1 | grep 'rebase aborted' + $ hg unshelve --abort 2>&1 | grep 'aborted' rebase aborted + unshelve of 'default-01' aborted + $ hg summary + parent: 0:ae8c668541e8 tip + root + branch: default + commit: 1 modified, 1 unknown + update: (current) + phases: 1 draft $ hg up -C . 1 files updated, 0 files merged, 0 files removed, 0 files unresolved _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel