Patchwork D3691: shelve: stop testing missing rebase state file

login
register
mail settings
Submitter phabricator
Date June 25, 2018, 3:21 p.m.
Message ID <d4a012888b9810c65eef4dfbf96c6513@localhost.localdomain>
Download mbox | patch
Permalink /patch/32425/
State Not Applicable
Headers show

Comments

phabricator - June 25, 2018, 3:21 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGa8f99334ae31: shelve: stop testing missing rebase state file (authored by lothiraldan, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3691?vs=8980&id=9292

REVISION DETAIL
  https://phab.mercurial-scm.org/D3691

AFFECTED FILES
  tests/test-shelve.t

CHANGE DETAILS




To: lothiraldan, #hg-reviewers, durin42
Cc: mercurial-devel

Patch

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 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 .