I'll do. That this line was wrong costed me an hour during development. I only looked up the srcParent RevCommit and when I later set the base of the merge to srcParent.getTree() the base was set to null. Everything succeeded afterwards but of course the merge result was buggy.