Export to GitHub

jigomerge - issue #23

Merge One-by-One does not work


Posted on Feb 13, 2012 by Happy Wombat

Using the option "-s|--single" results in an exception:

Caught: groovy.lang.MissingMethodException: No signature of method: SvnMergeTool.svnMergeAndCommit() is applicable for argument types: (java.lang.String, java.lang.String, null, java.lang.String) values: [file:///cygdrive/x/jigotest/repo/branch, 15, null, .] at SvnMergeTool.launchSvnMerge(jigomerge-2.2.6.groovy:140) at SvnMergeTool.main(jigomerge-2.2.6.groovy:568)

Line 140 should be:

svnMergeAndCommit(mergeUrl, [revision], validationScript, workingDirectory)

Comment #1

Posted on Feb 20, 2012 by Happy Wombat

Experienced the same issue with trunk, this fixed it.

Status: New

Labels:
Type-Defect Priority-Medium