Hello,
What is the exact way that this method does not work?
In url-url merging you pass a different revision range than in file-file
merging.
Try
svnDiffClient.doMerge(url1,SVNRevision.create(1), url2,SVNRevision.HEAD,
new File(dstPath), SVNDepth.INFINITY,true,false, false, false);
Also you pass dryRun = true, what leads to just displaying possible
changes that would happen if the merge were invoked without this flag set.
----
Alexander Sinyushkin,
TMate Software,
http://svnkit.com/ - Java [Sub]Versioning Library!
sivagurunath wrote:
> This issue is still not resolved
>
> It works when I give
> SVNRevisionRange rangesToMerge = new SVNRevisionRange(SVNRevision.create(1),
> SVNRevision.HEAD);
> svnDiffClient.doMerge(new File("/tmp/guruRepo"),
> SVNRevision.HEAD,Collections.singleton(rangesToMerge),new
> File("/tmp/sivaRepo"),SVNDepth.INFINITY, true, false, false,false);
>
> But its not work when I give 2 URLs
> svnDiffClient.doMerge(url1,SVNRevision.create(1), url2,SVNRevision.WORKING,
> new File(dstPath), SVNDepth.INFINITY,true,false, false, false);
>
> The later is the requirement I have i.e passing 2 URLs and merging
>
> Please help me as this one is eating my head....
---------------------------------------------------------------------
To unsubscribe, e-mail: svnkit-users-unsubscribe@svnkit.com
For additional commands, e-mail: svnkit-users-help@svnkit.com
