Re: problem/bug with conflict callback

Mark Phippard wrote:
[snip]
>> The last merge command results in a property conflict, but the conflict
>> resolution callback is not invoked.
>
> Are regular conflicts still using the callback? I ask because the
> JavaHL tests are currently failing in a way that implies the callback
> is not getting called:
>
> There was 1 error:
> 1) testBasicConflict(org.tigris.subversion.javahl.BasicTests)org.tigris.subversi
> on.javahl.ClientException: Conflict resolution failed
> svn: Conflict callback violated API: returned no results.

Yes, the callback gets invoked properly for file conflicts.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org