[PATCH rfc] merge: present merge part labels to user in prompts

[Simon Farnsworth]

On 18/03/2016, 16:50, "Pierre-Yves David" <pierre-yves.david at ens-lyon.org> wrote:


>On 03/18/2016 04:46 PM, Simon Farnsworth wrote:
>> On 16/03/2016, 18:30, "Pierre-Yves David" <pierre-yves.david at ens-lyon.org> wrote:
<snip>
>>> - Do we alway have only two labels? We never allow to change the "base"
>>> label?
>>
>> We do permit changes to the base label, AFAICT, we just don't use it outside of conflict markers. This is like the option to have different bases for each file in conflict; it's allowed by the code, we just don't use it.
>>
>> As we never prompt with the "base" label, I don't use it, but I do preserve it if present, in case future changes introduce a way to use "base".
>
>But you also use this preservation to regenerate conflict marker in the 
>`hg resolve` case, right? So we should store it.

True; I've never used a plain 'hg resolve', so I'd not noticed its ability to remerge - my instinct was just to save everything, and thus I wouldn't have broken this use case.

Simon