hg merge: -f didn't force

[Benoit Boissinot]

On 4/18/06, Sanjoy Mahajan <sanjoy at mrao.cam.ac.uk> wrote:
> Mercurial Distributed SCM (version 7e0dd64b0718)
>
> 'hg merge -f' didn't force a merge in the following (real) example.  My
> comments are in [brackets].  Am I trying something silly, or is it worth
> making a test case?  I can also post the repo as a .tgz file.
>
> $ hg tags
> hg tags
> tip                                8:3702cc9045f682a7ca4b58e9e49a0b72ceb6ebdc
> reserveobjnum                      3:5ff7b64309843dd8c957bb9aa7d474d606e7c901
> parent-searching                   2:e3d03f844111142b746b47c20506897b22961e0e
> $ hg merge parent-searching
> [works fine, and now I lazily try an 'octupus merge':]

You cannot make octopus merges, one rev can only have at most 2 parents.

regards,

Benoit