Mercurial > public > mercurial-scm > hg

diff tests/test-rebase-interruptions.t @ 19518:12843143663d stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: allow aborting when descendants detected With this, all aborts will succeed in removing the state, rather than leaving the user in 'what do I do now?' limbo.
author Matt Mackall <mpm@selenic.com>
date Thu, 01 Aug 2013 17:54:12 -0500
parents eab2ff59481e
children 9c78ed396075
line wrap: on
line diff
--- a/tests/test-rebase-interruptions.t	Thu Aug 01 17:45:13 2013 -0500
+++ b/tests/test-rebase-interruptions.t	Thu Aug 01 17:54:12 2013 -0500
@@ -180,8 +180,8 @@
 Abort the rebasing:
 
   $ hg rebase --abort
-  warning: new changesets detected on target branch, can't abort
-  [255]
+  warning: new changesets detected on target branch, can't strip
+  rebase aborted
 
   $ hg tglog
   @  6: 'Extra'