Patchwork [06,of,25,RFC] shelve: actually test corrupted shelve state

login
register
mail settings
Submitter Boris Feld
Date June 7, 2018, 2:11 p.m.
Message ID <98b3fa1f58c8da86a7d1.1528380665@Laptop-Boris.lan>
Download mbox | patch
Permalink /patch/32000/
State Accepted
Headers show

Comments

Boris Feld - June 7, 2018, 2:11 p.m.
# HG changeset patch
# User Boris Feld <boris.feld@octobus.net>
# Date 1527545555 -7200
#      Tue May 29 00:12:35 2018 +0200
# Node ID 98b3fa1f58c8da86a7d12faf4881bf3014637066
# Parent  e58a468f9cc8f92863439bfe74c8414c22c25ce0
# EXP-Topic graftshelve
# Available At https://bitbucket.org/octobus/mercurial-devel/
#              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 98b3fa1f58c8
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

Patch

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