Hi,
When I do a merge, using the following piece of code:
SVNDiffClient diffClient = clientManager.getDiffClient();
try {
System.out.println("Merging...");
dstPath = new File(wcPath + "\\trunk\\");
System.out.println("Merging " + branch.getPath() + " to
" +
trunk.getPath() + " at path "
+ dstPath.toString());
diffClient.doMerge(branch, SVNRevision.HEAD, trunk,
SVNRevision.HEAD,
dstPath, SVNDepth.INFINITY, true,
false, false, false);
} catch (SVNException svne) {
System.err.println("Error while attempting merge: " +
svne.getMessage());
System.exit(1);
}
I get the following exception:
Exception in thread "main" java.lang.ClassCastException: java.io.File cannot
be cast to java.lang.String
at
org.tmatesoft.svn.core.internal.util.SVNMergeInfoUtil.mergeCatalog(SVNMergeInfoUtil.java:82)
at
org.tmatesoft.svn.core.internal.wc2.ng.SvnNgMergeDriver.mergeCousinsAndSupplementMergeInfo(SvnNgMergeDriver.java:234)
at
org.tmatesoft.svn.core.internal.wc2.ng.SvnNgMerge.merge(SvnNgMerge.java:153)
at
org.tmatesoft.svn.core.internal.wc2.ng.SvnNgMerge.run(SvnNgMerge.java:49)
at
org.tmatesoft.svn.core.internal.wc2.ng.SvnNgMerge.run(SvnNgMerge.java:29)
at
org.tmatesoft.svn.core.internal.wc2.ng.SvnNgOperationRunner.run(SvnNgOperationRunner.java:20)
at
org.tmatesoft.svn.core.internal.wc2.SvnOperationRunner.run(SvnOperationRunner.java:20)
at
org.tmatesoft.svn.core.wc2.SvnOperationFactory.run(SvnOperationFactory.java:1200)
at org.tmatesoft.svn.core.wc2.SvnOperation.run(SvnOperation.java:292)
at
org.tmatesoft.svn.core.wc.SVNDiffClient.doMerge(SVNDiffClient.java:2264)
I get the same thing using 1.7.4-rc1, 1.7.4-rc2, plus the latest snapshot
for 1.7.4
Any ideas?
--
View this message in context:
http://old.nabble.com/ClassCastException-when-merging-tp33544863p33544863.html
Sent from the SVNKit - Users mailing list archive at Nabble.com.
