Request for rebaseif extension to be provided by default with rebase

Matt Mackall mpm at selenic.com
Tue Jun 21 12:33:12 CDT 2011


On Tue, 2011-06-21 at 14:28 +0200, Arne Babenhauserheide wrote:
> 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.

Comparisons to fetch aren't doing anyone any favors here: it would have
been dropped years ago if it weren't for our backward compatibility
rules. And we're not open to significantly changing its current behavior
(same rules!).

-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial mailing list