Re: problem/bug with conflict callback

Ben Collins-Sussman wrote:
> I never tested property-conflicts on anything other than 'svn up'. In
> other words, I made libsvn_wc/props.c invoke the callback many times,
> because that's where prop-merging (and property conflicts) happens.
> Is there *another* place where property-merging happens? Is it
> somehow different for 'svn merge'?

I guess I'm the wrong person to answer this question since I'm sure you
are much more familiar with the Subversion code than I am. But since my
script shows that the callback isn't called for property conflicts on
merge, I guess there must be some other place where it should be called.

Stefan

>
> On 10/22/07, Stefan Küng <tortoisesvn@gmail.com> wrote:
>> Hi,
>>
>> 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.
>>
>> 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
>>
>>
>

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