The ui.merge=internal:local does not work

[Mads Kiilerich]

Mathieu Clabaut wrote:
> On Tue, Mar 3, 2009 at 12:35, Mathieu Clabaut <mathieu.clabaut at gmail.com> wrote:
>   
>>>> Now, do you know of any way to do a merge while keeping local changes,
>>>> even when there are some merge configuration in .hgrc ?
>>>>         
>>> HGMERGE=internal:local hg merge
>>>       
>> Thank you, I'll try it next time...
>> Would it make a sens to propose a patch adding some options to "hg
>> merge", in order to integrate such a feature to mercurial user
>> interface ?
>>     
>
> It still doesn't work :
> HGMERGE=internal:other hg merge -r 312
>  local changed ONI_bak.bpr which remote deleted
> use (c)hanged version or (d)elete?
>
> But it is a bit better, as the configured merge machinery is skipped....
>   

In Mercurial the merge tools are used for merging file content. Merging 
a changed file with a deletion (or change to symlink og directory or 
some other weird case) is something else and at a higher level (a 
manifest merge).

AFAIK there is no simple way to avoid the prompt you get.

> Shall I open a bug ?
>   

Well ... It works as designed, so I don't think there is any bug to 
report. You could file a feature request and propose a change.

/Mads