Request for rebaseif extension to be provided by default with rebase

Marcin Kasperski Marcin.Kasperski at mekk.waw.pl
Wed May 25 09:58:57 UTC 2011


> [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....




More information about the Mercurial mailing list