histedit and rebase using memctx

Laurens Holst laurens.nospam at grauw.nl
Tue Feb 19 03:33:57 CST 2013

Op 18-02-13 22:13, Augie Fackler schreef:
> On Feb 18, 2013, at 12:26 PM, Sean Farley <sean.michael.farley at gmail.com> wrote:
>> Of course, if histedit, rebase, et al. could be improved to use memctx,
>> then I might change my tune :-)
> The problem (as I see it) with that is that both rebase and histedit can drop into a manual conflict resolution phase that requires the working copy to be clean.

Actually, personally I think it would be great if it would abort in that 
case. That would allow you to merge only when it’s a simple one without 
conflicts. I submitted patches for such a thing once. [1]



More information about the Mercurial-devel mailing list