Re: Problems with property conflict callback

Ben Collins-Sussman wrote:
> I just tested the CLI: if user A commits a change to 'svn:ignore' on
> a directory, and user B makes local mods to the same property, then
> when user B updates, the callback is *definitely* called.
>
> I'll take a look at your merge scenario below.

here's my test script:

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.exe import layout %repos% -m "created layout"
rd /s /q layout

svn.exe co %repos%/trunk wc
svn.exe cp %repos%/trunk %repos%/branches/branch -m "created branch"
svn.exe co %repos%/branches/branch wc2

svn.exe propset test aaa wc\file
svn.exe propset test aaa wc
svn.exe ci wc -m "set property"

svn.exe propset test bbb wc2\file
svn.exe propset test bbb wc2
svn.exe ci wc2 -m "set property"
svn.exe up wc2
svn.exe propset test ccc wc2\file
svn.exe propset test ccc wc2

svn.exe merge %repos%/trunk wc2 -r2:3

the last merge produces two prop conflicts, but only for the file prop
conflict the callback is called.

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