Mercurial > hg

diff tests/test-rebase-scenario-global.t @ 33120:b63351f6a246 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: backed out changeset 2519994d25ca In the process of fixing issue5610 in 4.2.2, we are trying to backout cf8ad0e6c0e4. This changeset is making changes that depend on cf8ad0e6c0e4, so we need to back it out first. Since issue5610 is pretty serious regression and the next stable release is a couple of days away, we are taking the backout route until we can figure out something better to do.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 27 Jun 2017 17:39:55 +0200
parents 2519994d25ca
children 40ee74bfa111
line wrap: on
line diff
--- a/tests/test-rebase-scenario-global.t	Fri Jun 23 13:33:41 2017 +0800
+++ b/tests/test-rebase-scenario-global.t	Tue Jun 27 17:39:55 2017 +0200
@@ -270,8 +270,6 @@
 
   $ hg rebase -s 6 -d 1
   rebasing 6:eea13746799a "G"
-  transaction abort!
-  rollback completed
   abort: cannot use revision 6 as base, result would have 3 parents
   [255]
   $ hg rebase --abort