Mercurial > public > mercurial-scm > hg

diff tests/test-rebase-interruptions.t @ 19517:eab2ff59481e stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: continue abort without strip for immutable csets (issue3997) This causes us to simply discard the rebase state.
author Matt Mackall <mpm@selenic.com>
date Thu, 01 Aug 2013 17:45:13 -0500
parents e5a5790a3185
children 12843143663d
line wrap: on
line diff
--- a/tests/test-rebase-interruptions.t	Thu Aug 01 17:33:09 2013 -0500
+++ b/tests/test-rebase-interruptions.t	Thu Aug 01 17:45:13 2013 -0500
@@ -248,9 +248,8 @@
 Abort the rebasing:
 
   $ hg rebase --abort
-  abort: can't abort rebase due to immutable changesets 45396c49d53b
-  (see hg help phases for details)
-  [255]
+  warning: can't clean up immutable changesets 45396c49d53b
+  rebase aborted
 
   $ hg tglogp
   @  5:public 'B'