The ui.merge=internal:local does not work

[Matt Mackall]

On Tue, 2009-03-03 at 18:12 +0100, Mads Kiilerich wrote:
> 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.

There is, actually:

HGMERGE=true hg merge -y -r 312   # do a completely non-interactive
merge
hg revert -a -r 312  # revert everythin to match 312


You probably don't want to make a habit of doing these sorts of
pseudo-merges though.

-- 
http://selenic.com : development and support for Mercurial and Linux