Don't crash the submit queue when a change is a criss-cross merge
A criss-cross merge occurs when two branches have merged in both
directions and there are now multiple candidate merge bases for
the merge between the change and the branch head. (For more on
this see http://revctrl.org/CrissCrossMerge.)
If JGit finds multiple merge bases, it throws an IOException. If
we catch this and mark a special status code, we can unsubmit the
change and let the user know about the problem by reporting it as
a message on the change, just like we do with path conflicts.
Bug: GERRIT-171
Signed-off-by: Shawn O. Pearce <sop@google.com>
2 files changed
