merge fails - multiple merge bases

[Kd]

Got a few submits stuck in the submitted - merge pending state. Read
on this list about there being some parent that possible didn't get
uploaded. Looked for one, but the tree's looked cleaned. Looking at
the jetty logs, I see this:

2009-03-09 22:04:04,612::ERROR: com.google.gerrit.git.MergeQueue -
Merge attemp
t for platform/hardware/ti/omx,refs/heads/master failed
com.google.gerrit.git.MergeException: Cannot merge
86241ac9ddd5af8af9eef461eba7a
9b8cb9b0386
<snip>
Caused by: java.io.IOException: Multiple merge bases for:
31049c2f776cee3bcce4c2f5892e9663b6f7d44a
86241ac9ddd5af8af9eef461eba7a9b8cb9b0386found:
07145bb4ef5c4be635ce771d3df133949aeed92c
3818c1aafd7cf55b88d38db3ec6559099f704586
at org.spearce.jgit.merge.Merger.mergeBase(Merger.java:177)
at org.spearce.jgit.merge.StrategySimpleTwoWayInCore
$InCoreMerger.mergeI
mpl(StrategySimpleTwoWayInCore.java:107)
at org.spearce.jgit.merge.Merger.merge(Merger.java:143)
at com.google.gerrit.git.MergeOp.mergeTopics(MergeOp.java:296)
... 38 more

Any hints on where I should look?

Thanks,
...Kd

[Shawn Pearce]

*sigh*

Its an unsupported operation right now, doing a criss-cross merge.  Normally git-core produces a synthetic merge base by merging the multiple merge bases pair-wise until there is only one, and then proceeds with the merge using that synthetic base.  JGit (and Gerrit) don't support that yet.

Work around for now would be to download the change, rebase it onto the current branch, upload the replacement with "repo upload --replace", and then submit the replacement.

[Kd]

Hum - stopped gerrit and upgraded to 2.0.6. When I restarted it, all
my outstanding submitted changes merged in cleanly. Seems to be
working again.

...Kd