Re: Another segfault in the wc prop merge code...

John Szakmeister <john@szakmeister.net> writes:

> Reproduction recipe:
>
> svn up -r15856
> svn merge \
> http://svn.collab.net/repos/svn/branches/python-bindings-improvements \
> -r15854:15856 .
>
> The merge will generate the segfault.

A merge that adds a directory with properties is the problem:

#!/bin/bash

SVN=svn
REPO=file://`pwd`/repo
#REPO=svn://localhost/repo
#REPO=http://localhost:8888/obj/repo
rm -rf repo wc
#svnadmin create --fs-type bdb --bdb-txn-nosync repo
svnadmin create repo
echo [general] >> repo/conf/svnserve.conf
echo anon-access = write >> repo/conf/svnserve.conf
#echo auth-access = write >> repo/conf/svnserve.conf
echo password-db = passwd >> repo/conf/svnserve.conf
echo [users] >> repo/conf/passwd
echo pm = mp >> repo/conf/passwd
echo xx = xx >> repo/conf/passwd

$SVN mkdir $REPO/foo $REPO/bar
$SVN co $REPO wc
$SVN mkdir wc/foo/zig
$SVN ps x x wc/foo/zig
$SVN ci wc
$SVN merge -r1:HEAD $REPO/foo wc/bar

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org