Question about internal:fail

[Stephen Rasku]

On Thu, Dec 1, 2011 at 11:45, Mike Meyer <mwm at mired.org> wrote:

> $ hg merge --tool internal:fail
> 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
> (branch merge, don't forget to commit)
> $ cat *
> bar1
> hello
> bar2
> hello
>
> I needed to add "hello". It got added to different files on the two
> branches. So both files differ between the branches, I can't use
> resolve on either one, and it only told me about one of them changing!
> I have to find the other one by hand.
>
>     <mike

This is how I would expect this to work.  foo2 has been modified on
branch 2 and you're on branch 2 so there's nothing to merge.  The only
changes that get merged in are the changes to foo1 on branch 1.

If you want to be aware of all changes on either branch I think you
need to add a third integration branch.  You would have to do two
merges, though: one from branch 1 and another from branch 2.  I think
I may be confused about what you want, though.

...Stephen