Hello,
Yes, you're doing this right.When passing dryRyn=true, no real content
changes are performed,
but still all SVNEvents that would come out in a normal case (not a dry
run) are passed to
the registered ISVNEventHandler as well. So, you need to implement your
own ISVNEventHandler
and pass it to SVNDiffClient (through its setEventHandler() setter). In
the handleEvent() method of
your handler you should look through event actions which SVNKit sends
you in
SVNEvent.getAction():SVNEventAction. If a merge causes a tree-conflict,
you'll get SVNEventAction.TREE_CONFLICT,
to find out if there's a text or prop conflict, you have to check
SVNEvent.getContentsStatus() and SVNEvent.getPropertiesStatus()
for SVNStatusType.CONFLICTED\SVNStatusType.CONFLICTED_UNRESOLVED while
SVNEvent.getAction() can be any of
SVNEventAction.UPDATE_*. I hope the idea is clear.
----
Alexander Sinyushkin,
TMate Software,
http://svnkit.com/ - Java [Sub]Versioning Library!
http://sqljet.com/ - Java SQLite Library!
chathu wrote:
> Hi,
>
> My svnkit version is 1.3.0. I used doMerge to mergr resository file to the
> local copy. I used fallowing method.
>
> doMerge(SVNURL url1,SVNRevision revision1,File path2,SVNRevision
> revision2,File dstPath,SVNDepth depth,boolean useAncestry,boolean
> force,boolean dryRun,boolean recordOnly)throws SVNException
>
> Also I need to first check if this file is conflicted. If it is not
> conflicted I need to continue the merge. else stop this operation and
> perform another operation.
>
> So I put dryrun as true.
>
> I need to know how can I get a output from this. I couldn't find any out
> parameters or any handlers.
>
> I need to know is there any wrong in my approach. Please mention is there
> any alternative way to satisfy my requirement.
>
> Thank you,
> Regards,
> Chathurika.
>
---------------------------------------------------------------------
To unsubscribe, e-mail:
svnkit-users-unsubscribe@...
For additional commands, e-mail:
svnkit-users-help@...
