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

Re: Problems with property conflict callback

From: Ben Collins-Sussman <sussman_at_red-bean.com>
Date: 2007-10-31 16:31:24 CET

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

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

Stefan, I took your script, tweaked it slightly to run on Unix, and
also had it make propchanges not only to a file and
working-copy-root-dir, but also to a subdir within the working copy.

When I run the script, I cannot reproduce the problem using today's
trunk code (r27519). The CLI conflict-callback is called on all three
prop-conflicts:

Conflict for property 'test' discovered on 'wc2/file'.
Select: (p)ostpone, (m)ine, (t)heirs, (h)elp for more options : p
--- Merging r3 into 'wc2':
 C wc2/file
Conflict for property 'test' discovered on 'wc2/subdir'.
Select: (p)ostpone, (m)ine, (t)heirs, (h)elp for more options : p
 C wc2/subdir
Conflict for property 'test' discovered on 'wc2'.
Select: (p)ostpone, (m)ine, (t)heirs, (h)elp for more options : p
 C wc2

Here's my unix script:

#!/bin/bash

export repos=file:///home/sussman/homedir/scratch/testrepos

rm -rf testrepos wc wc2

svnadmin create testrepos
mkdir layout
mkdir layout/trunk
echo test > layout/trunk/file
mkdir layout/trunk/subdir
mkdir layout/branches
svn import layout $repos -m "created layout"
rm -rf 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 propset test aaa wc
svn propset test aaa wc/subdir
svn ci wc -m "set trunk properties"

svn propset test bbb wc2/file
svn propset test bbb wc2
svn propset test bbb wc2/subdir
svn ci wc2 -m "set branch properties"

svn up wc2
svn propset test ccc wc2/file
svn propset test ccc wc2
svn propset test ccc wc2/subdir

svn merge $repos/trunk wc2 -r2:3

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Oct 31 16:31:40 2007

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