how to do svn merge with 2 URLs and destination path

[sivagurunath]

Hi,

In SVNKit, we have a function of doMerge like
void doMerge(SVNURL url1, SVNRevision revision1, SVNURL url2, SVNRevision revision2, File dstPath, SVNDepth depth, boolean useAncestry, boolean force, boolean dryRun, boolean recordOnly)


But when I use this its not working but from the SVN command line its working...Regarding this some unanswered question highlights this as a bug http://www.nabble.com/Merge-and-Conflict-Question-td10262038.html

Is this a bug in svnkit?? If not please advice me how to use this....

Regards
Sivagurunath

[sivagurunath]

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....

[Alexander Sinyushkin]

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@...
For additional commands, e-mail: svnkit-users-help@...

[sivagurunath]

Thanks Alexander Sinyushkin....

It works now suddenly out of the blue... I dont know what I did wrong...

Thanks again
Sivagurunath

Alexander Sinyushkin wrote:

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: [e-mail]
For additional commands, e-mail: [e-mail]