Patchwork [3,of,3,V4] rebase tests: remove test that touched 'rebasestate' directly

login
register
mail settings
Submitter Valters Vingolds
Date Jan. 6, 2017, 3:11 p.m.
Message ID <7dbf18edd08f5de0c74d.1483715465@w540>
Download mbox | patch
Permalink /patch/18115/
State Superseded
Headers show

Comments

Valters Vingolds - Jan. 6, 2017, 3:11 p.m.
# HG changeset patch
# User Valters Vingolds <valters@vingolds.ch>
# Date 1483701570 -3600
#      Fri Jan 06 12:19:30 2017 +0100
# Node ID 7dbf18edd08f5de0c74df8b3256bc62146081dd0
# Parent  f9ef0679fabea8ef0ab65aa7f76258e248473a8e
rebase tests: remove test that touched 'rebasestate' directly

Patch

diff --git a/tests/test-rebase-pull.t b/tests/test-rebase-pull.t
--- a/tests/test-rebase-pull.t
+++ b/tests/test-rebase-pull.t
@@ -79,12 +79,6 @@ 
   abort: uncommitted changes
   [255]
   $ hg update --clean --quiet
-  $ touch .hg/rebasestate # make rebase think there's one in progress right now
-  $ hg pull --rebase
-  abort: rebase in progress
-  (use 'hg rebase --continue' or 'hg rebase --abort')
-  [255]
-  $ rm .hg/rebasestate
 
 Abort pull early if another operation (graft) is in progress:
   $ cd ..