[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: problem/bug with conflict callback

From: Mark Phippard <markphip_at_gmail.com>
Date: 2007-10-23 14:49:37 CEST

On 10/22/07, Stefan Küng <tortoisesvn@gmail.com> wrote:

> I'm using an svn client built from r27297.
>
> Problem: the conflict callback isn't called for property conflicts (even
> though that revision should already include that).
>
> The following script shows the problem:
>
> set repos=file:///d:/test/repoprop
> if exist repoprop rd /s /q repoprop
> if exist wc rd /s /q wc
> if exist wc2 rd /s /q wc2
> svnadmin create repoprop
> md layout
> md layout\trunk
> echo test > layout\trunk\file
> md layout\branches
> svn import layout %repos% -m "created layout"
> rd /s /q layout
> svn co %repos%/trunk wc
> svn cp %repos%/trunk %repos%/branches/branch -m "created branch"
> svn co %repos%/branches/branch wc2
> svn propset test aaa wc\file
> svn ci wc -m "set property"
> svn propset test bbb wc2\file
> svn merge %repos%/trunk wc2 -r2:3
>
> 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.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Oct 23 14:49:48 2007

This is an archived mail posted to the Subversion Dev mailing list.