What steps will reproduce the problem? 1. Launch a merge, which has conflicts

What is the expected output? What do you see instead? Caught: groovy.lang.MissingMethodException: No signature of method: SvnMergeTool.svnMergeMerge() is applicable for argument types: (java.lang.String, java.util.ArrayList) values: [http://..., [*, *, *]] at SvnMergeTool.svnMergeAndCommit(jigomerge-2.2.2.groovy:172) at SvnMergeTool.launchSvnMerge(jigomerge-2.2.2.groovy:154) at SvnMergeTool.main(jigomerge-2.2.2.groovy:480)

What version of the product are you using? On what operating system? 2.2.2 - GNU/Linux Ubuntu 10.10 amd64

Please provide any additional information below.

Fixed with this patch :

--- /tmp/jigomerge-2.2.2.groovy.bad 2011-03-10 18:03:53.798462180 +0100 +++ /tmp/jigomerge-2.2.2.groovy.good 2011-03-10 18:03:44.088001417 +0100 @@ -169,7 +169,7 @@ protected def void svnMergeAndCommit(String mergeUrl, List revisionsList, String validationScript, String workingDirectory) {

 def revisionsListLabel = buildRevisionsList(revisionsList)

- def status = svnMergeMerge(mergeUrl, revisionsList, workingDirectory) + def status = svnMergeMerge(mergeUrl, revisionsList) if (!status) { throw new RuntimeException('Merging valid revisions (' + revisionsListLabel + ') failed !') }

Thanks for the patch ... again :)