Mercurial > hg
comparison tests/test-rebase-scenario-global.t @ 33120:b63351f6a246 stable
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 |
comparison
equal
deleted
inserted
replaced
33026:231690dba9b4 | 33120:b63351f6a246 |
---|---|
268 | 268 |
269 G onto B - merge revision with both parents not in ancestors of target: | 269 G onto B - merge revision with both parents not in ancestors of target: |
270 | 270 |
271 $ hg rebase -s 6 -d 1 | 271 $ hg rebase -s 6 -d 1 |
272 rebasing 6:eea13746799a "G" | 272 rebasing 6:eea13746799a "G" |
273 transaction abort! | |
274 rollback completed | |
275 abort: cannot use revision 6 as base, result would have 3 parents | 273 abort: cannot use revision 6 as base, result would have 3 parents |
276 [255] | 274 [255] |
277 $ hg rebase --abort | 275 $ hg rebase --abort |
278 rebase aborted | 276 rebase aborted |
279 | 277 |