histedit and rebase using memctx
raf at durin42.com
Tue Feb 19 10:06:17 CST 2013
On Tue, Feb 19, 2013 at 4:33 AM, Laurens Holst <laurens.nospam at grauw.nl> wrote:
> 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>
>>> 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
Breaks my workflow heavily, so I wouldn't welcome this.
> That would allow you to merge only when it’s a simple one without
> conflicts. I submitted patches for such a thing once. 
More information about the Mercurial-devel