[PATCH 1 of 1] rebase: hard-code 'hg pull --rebase' to use internal:fail merge tool

[Sune Foldager]

On 2011-05-26 18:00, Adrian Buehlmann wrote:
>On 2011-05-26 17:45, Sune Foldager wrote:
>> But this is not
>> a big deal, really. I am more concerned with my other question:
>>
>> What happens when it aborts halfway through a multi-changeset rebase?
>
>Good question. We have to investigate that for sure and I agree I
>haven't answered that (yet).
>
>But at this point, let me reply with (an incomplete) counter question:
>
>Is the state that rebase leaves if it stops rebasing due to conflicts an
>"invalid" state?
>
>If it is (an invalid state), why does it let me commit, after I have
>resolved the conflicts? :p

Well, probably not... at least not prima facie, but what about subsequent
calls to rebase --abort or --continue, for instance? Normally, an aborted
merge mid-rebase means you can then use those to move on.