Patchwork D2877: tests: demonstrate aborted rebase strips commits that didn't need rebasing

login
register
mail settings
Submitter phabricator
Date March 19, 2018, 2:15 p.m.
Message ID <8ef5dea6cdce5361605dd4856b629ff9@localhost.localdomain>
Download mbox | patch
Permalink /patch/29629/
State Not Applicable
Headers show

Comments

phabricator - March 19, 2018, 2:15 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGb9a6ee2066f9: tests: demonstrate aborted rebase strips commits that didn&#039;t need rebasing (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2877?vs=7074&id=7115

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

AFFECTED FILES
  tests/test-rebase-partial.t

CHANGE DETAILS




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

Patch

diff --git a/tests/test-rebase-partial.t b/tests/test-rebase-partial.t
--- a/tests/test-rebase-partial.t
+++ b/tests/test-rebase-partial.t
@@ -69,6 +69,36 @@ 
   |/
   o  0: 426bada5c675 A
   
+Abort doesn't lose the commits that were already in the right place
+
+  $ hg init abort
+  $ cd abort
+  $ hg debugdrawdag <<EOF
+  > C
+  > |
+  > B D  # B/file = B
+  > |/   # D/file = D
+  > A
+  > EOF
+  $ hg rebase -r C+D -d B
+  rebasing 2:ef8c0fe0897b "D" (D)
+  merging file
+  warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
+  unresolved conflicts (see hg resolve, then hg rebase --continue)
+  [1]
+  $ hg rebase --abort
+  saved backup bundle to $TESTTMP/abort/.hg/strip-backup/79f6d6ab7b14-cce2340e-backup.hg
+  rebase aborted
+BROKEN: C got stripped
+  $ hg tglog
+  o  2: ef8c0fe0897b D
+  |
+  | o  1: 594087dbaf71 B
+  |/
+  o  0: 426bada5c675 A
+  
+  $ cd ..
+
 Rebase with "holes". The commits after the hole should end up on the parent of
 the hole (B below), not on top of the destination (A).