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

problem/bug with conflict callback

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-10-22 19:20:00 CEST


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.


   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
Received on Mon Oct 22 19:20:21 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.