[PATCH 3 of 3] backout: add a message after backout that need manual commit

[Pierre-Yves David]

On 01/17/2014 08:27 AM, Gregory Szorc wrote:
> On 1/16/14, 6:48 AM, Augie Fackler wrote:
>> On Wed, Jan 08, 2014 at 05:40:17PM -0800, 
>> pierre-yves.david at ens-lyon.org wrote:
>>> # HG changeset patch
>>> # User Pierre-Yves David <pierre-yves.david at fb.com>
>>> # Date 1389230606 28800
>>> #      Wed Jan 08 17:23:26 2014 -0800
>>> # Node ID 01daa33a1bd975621e9e54ef359f306746c69e23
>>> # Parent  693ba13bf57b3654617cc77e485df7f68235227b
>>> backout: add a message after backout that need manual commit
>> I think the message makes sense, but I think I'd rather it just said
>> "changeset %s backed out - do not forget to commit" rather than
>> including the potentially-confusing "in-place" statement. Thoughts?
>>
>> I've queued patches 1 and 2.
>>
> Should backout write an "unfinished state" marker (similar to how 
> rebase, graft, etc work)?

Don't think so, neither merge nor shelve needs it.

> While I haven't written a patch yet, I'm pretty sure the "annotated 
> backouts" feature described at [1] will require a persistent state 
> marker to handle the manual commit case. I don't mean to bloat scope - 
> just raising a future concern.
>
> [1] http://www.selenic.com/pipermail/mercurial/2013-November/046246.html

Yeah out of scope but interresting feature.

-- 
Pierre-Yves