Patchwork D9508: tests: show that in-memory rebase leaves state when working copy is dirty

login
register
mail settings
Submitter phabricator
Date Dec. 2, 2020, 11:46 p.m.
Message ID <differential-rev-PHID-DREV-q27sic2qm2iqgwqnqa4s-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/47790/
State Superseded
Headers show

Comments

phabricator - Dec. 2, 2020, 11:46 p.m.
martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  When in-memory rebase falls back to on-disk rebase, it checks if the
  working copy is dirty. If it is, it aborts the rebase. However, it
  leaves the rebase state on disk. I broke it in feffeb18d412 <https://phab.mercurial-scm.org/rHGfeffeb18d412c334bbcb72e05b061cacb5ba9e71> (rebase:
  teach in-memory rebase to not restart with on-disk rebase on conflict,
  2020-09-18).

REPOSITORY
  rHG Mercurial

BRANCH
  stable

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

AFFECTED FILES
  tests/test-rebase-inmemory.t

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/tests/test-rebase-inmemory.t b/tests/test-rebase-inmemory.t
--- a/tests/test-rebase-inmemory.t
+++ b/tests/test-rebase-inmemory.t
@@ -487,6 +487,14 @@ 
   [255]
   $ cat a
   dirty
+  $ hg status -v
+  M a
+  # The repository is in an unfinished *rebase* state.
+  
+  # To continue:    hg rebase --continue
+  # To abort:       hg rebase --abort
+  # To stop:        hg rebase --stop
+  
 
 Retrying without in-memory merge won't lose merge state
   $ cd ..