Mercurial > public > mercurial-scm > hg

diff tests/test-rebase-partial.t @ 36981:177f3b90335f stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: on abort, don't strip commits that didn't need rebased (issue5822) I clearly missed adding this condition in 78496ac30025 (rebase: allow rebase even if some revisions need no rebase (BC) (issue5422), 2017-05-11). Perhaps I should have opted for the "revdone" solution I mentioned there... Differential Revision: https://phab.mercurial-scm.org/D2879
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 15 Mar 2018 22:35:07 -0700
parents b9a6ee2066f9
children 5abc47d4ca6b
line wrap: on
line diff
--- a/tests/test-rebase-partial.t	Thu Mar 15 21:40:51 2018 -0700
+++ b/tests/test-rebase-partial.t	Thu Mar 15 22:35:07 2018 -0700
@@ -87,13 +87,13 @@
   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  3: 79f6d6ab7b14 C
   |
-  | o  1: 594087dbaf71 B
+  | o  2: ef8c0fe0897b D
+  | |
+  o |  1: 594087dbaf71 B
   |/
   o  0: 426bada5c675 A