From patchwork Sat Jun 16 20:24:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: D3686: shelve: wider check for successful abort in test From: phabricator X-Patchwork-Id: 32203 Message-Id: To: mercurial-devel@mercurial-scm.org Date: Sat, 16 Jun 2018 20:24:30 +0000 This revision was automatically updated to reflect the committed changes. Closed by commit rHG2313a3599e41: shelve: wider check for successful abort in test (authored by lothiraldan, committed by ). REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D3686?vs=8974&id=9115 REVISION DETAIL https://phab.mercurial-scm.org/D3686 AFFECTED FILES tests/test-shelve.t CHANGE DETAILS To: lothiraldan, #hg-reviewers Cc: mercurial-devel 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 @@ [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