6 Commits

Author	SHA1	Message	Date
Dan Villiom Podlaski Christiansen	4bc99faa5e	rebase: improve error message on improper phases ... The previous error message had two issues: The first issue was that it wasn't, in fact, an error but a warning, even though it described a fatal error condition preventing the successful completion of the command. The second was that it didn't mention the immutable changesets, leaving the user guessing at the true cause of the error. The main downside to this change is that we now get an 'abort: can't abort...' message which technically contradicts itself. In this case, I blame that on the two uses we have for the word; if it weren't for backwards compatibility, we could make util.Abort print out 'error: <whatever>'.	2012-06-18 11:16:24 +02:00
Alain Leufroy	fd923bd6e3	rebase: fix phases movement ... Rebase now try to keep the phases of source changesets.	2012-01-17 09:12:14 +01:00
Pierre-Yves David	7e4f710bf6	phases: prevent rebase to rebase immutable changeset.	2011-12-27 00:11:22 +01:00
Matt Mackall	66de5cde16	merge: give a special message for internal:merge failure (issue3105)	2011-11-16 18:04:19 -06:00
Steve Borho	6fc11bd3c7	rebase: improve resolve failure message	2010-10-30 16:58:15 -05:00
Adrian Buehlmann	1f4e98cf76	tests: unify test-rebase*	2010-10-01 16:10:06 +02:00