---%<---
Last OK revision: 04b1196926a4
pulling from http://hg.netbeans.org/jet-main/
searching for changes
adding changesets
adding manifests
adding file changes
added 110 changesets with 187 changes to 121 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
abort: branch 'default' has 3 heads - please merge with an explicit rev
Merge failed.
changeset:   149813:04b1196926a4
tag:         tip
parent:      149811:0df288cebfdb
parent:      149812:4cfef30fbb97
user:        Vita Stejskal <vstejskal@netbeans.org>
date:        Fri Oct 16 19:46:53 2009 +0200
summary:     Automated merge with http://hg.netbeans.org/jet-main

changeset:   149703:09a959656cfc
parent:      149701:e74cacf72b2d
parent:      149702:eb2aafddc293
user:        ffjre@netbeans.org
date:        Fri Oct 16 23:36:13 2009 +0200
summary:     Merge of http://hg.netbeans.org/cnd-main/

Script failed with exitcode 7 rolling back to 09a959656cfc
---%<---

Clearly the error message is wrong; there are only two heads.

My suspicion is that the merging of the vcs-indexing-integration-167098 branch is confusing 'hg merge' when it looks for
the head to merge with. This slave node is running Hg 1.2.1 which might not have the latest fixes when it comes to
handling branches. I have not managed to reproduce such a problem locally using Hg 1.2.1, but there were changes in 1.3
& 1.3.1 relating to the branch cache which might be relevant.


BTW I noticed that round-robin-push#rollback looks wrong:

    hg --config extensions.mq= strip -n "$BASETIP"
    hg pull -r "$BASETIP"

This will only strip off changesets from the team repo which happen to be descendants of $BASETIP. If there are other
changesets from the team repo that were based on earlier changesets, they will be left in the workspace. I don't know
what ill effects this could cause.