[issue2945] file conflicts should not prompt when using internal:local or internal:other

[Axel Hecht]

New submission from Axel Hecht <axel at pike.org>:

When you try to merge two revs where one removed a file and one edits it,
the code in merge.py unconditionally does a ui.promptchoice()

If I specify internal:local or :other, though, it should just take that as
an answer. That's only picked up in filemerge, though.

Context is that we're trying to automate a no-op-merge at mozilla for our 90
l10n repos.

Testcase:

hg init testmerge
cd testmerge
echo foo > foo
hg add foo
hg ci -m"initial commit"
hg rm foo
hg commit -m"remove on one rev"
hg update -r 0
echo bar > foo
hg ci -m"change the file on other rev"
hg --config ui.config=internal:local merge

----------
messages: 17089
nosy: Pike
priority: wish
status: unread
title: file conflicts should not prompt when using internal:local or internal:other

____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue2945>
____________________________________________________