histedit and rebase using memctx (was: Re: [PATCH 2 of 2 RFCv2] commands: introduce stash command)

Sean Farley sean.michael.farley at gmail.com
Mon Feb 18 15:57:42 CST 2013


Augie Fackler writes:

> 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.
>
> If we had some generalized (safe) stashing mechanism (which a stash command could use), I'd be a fan of wiring that into histedit and rebase.

That's a good point. But it'd only need to happen when there's a
conflict. Here's hoping that David's patches get incorporated
soon :-)


More information about the Mercurial-devel mailing list