Request for rebaseif extension to be provided by default with rebase

[Arne Babenhauserheide]

On Tuesday 21 June 2011 11:45:11 Sébastien Deleuze wrote:
> Anyway, I think that rebaseif (or "safe rebase, else merge") behaviour is a
> lot better than current fetch behaviour that is distributed by default with
> Mercurial, wich do stupid and automatic merge even when not needed.

I’d prefer fetch to have some more intelligence: do a merge but undo it, if 
there are conflicts which require human interaction.

A bit of additional history does not hurt.

Best wishes, 
Arne
-- 
Unpolitisch sein
heißt politisch sein, 
ohne es zu merken. 
- Arne (http://draketo.de)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 316 bytes
Desc: This is a digitally signed message part.
URL: <http://selenic.com/pipermail/mercurial/attachments/20110621/e686c1ed/attachment.pgp>