[PATCH 0 of 1] Select internal conflict resolution tool with a merge option

[Matt Mackall]

On Sun, 2010-03-07 at 10:28 -0500, Greg Ward wrote:
> On Sun, Mar 7, 2010 at 8:50 AM, Dirkjan Ochtman <dirkjan at ochtman.nl> wrote:
> > On Sun, Mar 7, 2010 at 14:11, Isaac Jurado <diptongo at gmail.com> wrote:
> >> In order to achieve dummy merges, one has two options:
> >>
> >>    hg --config ui.merge=internal:local merge
> >>    hg debugsetparents . other_head
> >
> > Actually the nice version IMO is hg revert -r. -a.
> 
> Which is annoying because the preceding "merge" command can interrupt
> the process with prompts.  Or at least it has done so to me at some
> point in the distant past.  "WTF? Why should I have to answer this
> prompt when I'm simply going to revert any additions/removals merged
> in from the other head?"

I'm actually not particularly interested in optimizing this case as I
think dummy merges are already over-used.

By the way, one of the oft-claimed use cases for dummy merges is to hide
stray heads. In 1.5, heads now takes a named-branch-centric view of
things and closed heads are now hidden by default.

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