Question about internal:fail

[Dennis Brakhane]

On Thu, Dec 1, 2011 at 3:23 AM, Mike Meyer <mwm at mired.org> wrote:
> That's not what I want. What I *really* want is a way to use
> resolves machinery on every file that differs between the two
> branches. The original idea was to use internal:fail to start
> that. That was when I discovered that it wasn't called under
> conditions when I thought it should be. That's why the subject line is
> about internal:fail.

Let's review your example:

fedora% sh -v testcase
hg init x
cd x
echo "Testing" > foo
hg add foo
hg ci -m "Initial version"
echo hello >> foo
hg ci -m "Branch 1"
hg up 0
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
cp foo foo2
hg add foo2
hg ci -m "Branch 2"
created new head
hg up 1
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
hg merge --tool internal:fail
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)


There are really no files that differ, foo2 is a new file to
hg. It doesn't know that it is a copy of foo.
If you replace "cp foo foo2" with "hg foo foo2", hg will know
it's a copy and probably do exactly what you want.

Greetings,
  Dennis