Request for rebaseif extension to be provided by default with rebase

Sébastien Deleuze seb at deleuze.fr
Wed May 25 10:26:18 UTC 2011


I agree, it would be even better if abort could be the default
behaviour for "hg pull --rebase" since fallback to pure "hg pull" in
case of conflicts make sense from my point of view.

On Wed, May 25, 2011 at 11:58 AM, Marcin Kasperski
<Marcin.Kasperski at mekk.waw.pl> wrote:
>> [rebase]
>> onconflict=interrupt (default), abort or abortAndMerge
>>
>> - interrupt : interrupt and let the repository in a REBASING state
>> (current behaviour)
>> - abort : abort (behaviour I prefer). I case of hg pull --rebase, it
>> means that in case of rebase conflict, it will be equivalent to a
>> simple hg pull
>> - abortAndMerge : abort and run a merge (current rebaseif behaviour)
>>
>> And maybe some command ligne option like hg rebase --abortonconflict
>
> Nice idea IMHO. Even better if 'abort' could be default....
>
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
>



More information about the Mercurial mailing list