[PATCH] merge: warn about adding unstable commit

Pierre-Yves David pierre-yves.david at ens-lyon.org
Wed Dec 30 13:09:24 CST 2015



On 12/30/2015 12:21 AM, Augie Fackler wrote:
> On Mon, Dec 28, 2015 at 01:49:44PM -0600, timeless wrote:
>> # HG changeset patch
>> # User timeless <timeless at mozdev.org>
>> # Date 1451330894 0
>> #      Mon Dec 28 19:28:14 2015 +0000
>> # Node ID 6b68288cf77cefcea45e168c6bf85cc86f5db52c
>> # Parent  23541bdd1610c08af247f9c8719045cf247ce541
>> merge: warn about adding unstable commit
>>
>
> +1

Not really enthusiastic. What happen here is that you have an obsolete 
working copy parent and that will lead to unstable changeset on commit.

We -already- have a message for obsolete working copy parent. It live in 
the evolve extensions. (used by various command including hg update` and 
`hg pull`)
We should:

1) Use the same message in both case,
2) improve that unified message if we think we should,
3) (probably) move this message from evolve into code now that we have a 
clearer policy about "This is experimental stuff in Core, we can change 
it until we lift the experimental adjective to t

Let me know if my feedback is clear enough.

-- 
Pierre-Yves David


More information about the Mercurial-devel mailing list