[SVN-3857] Segmentation Fault in foreign repository merge with prop conflict (propmod atop missing prop)

• Type: Bug
• Status: Closed
• Priority: Blocker
• Resolution: Fixed
• Affects Version/s: trunk
• Fix Version/s: 1.7.0
• Component/s: src
• Assignee: C. Michael Pilato
• Reporter: C. Michael Pilato
• Created: 15/Apr/11 14:59
• Updated: 27/Oct/18 16:29
• Resolved: 15/Apr/11 16:28

Description

I was able to trigger a Segmentation Fault with my more-or-less HEAD client
today.  No time to look at the problem right now, but here's the recipe:

---------------------------------------------------------------------
#!/bin/sh
REPO=issue-repos
WC=issue-wc
VIEWVC_REPO=http://viewvc.tigris.org/svn/viewvc

rm -rf ${REPO} ${WC}
svnadmin create ${REPO}
svn co file://`pwd`/${REPO} ${WC}
svn export --force ${VIEWVC_REPO}/branches/1.1.x/@2282 ${WC}
rm -rf ${WC}/templates-contrib/
svn add ${WC}/*
svn ci -m "Import viewvc 1.1.x @ 2282" ${WC}
svn up ${WC}
svn merge -r2282:2534 ${VIEWVC_REPO}/branches/1.1.x ${WC}
svn merge ${VIEWVC_REPO}/branches/1.1.x@2534 \
          ${VIEWVC_REPO}/tags/1.1.10 ${WC}
---------------------------------------------------------------------

I do notice that after the segfault, there are two tempfiles left around which
contain the contents of the before and after property values of the
svn:externals property which is set on the root directory in the ViewVC
repository.  Of course, this property doesn't exist at all in the local working
copy, so this is a property conflict situation.

$ cat svn-YXxNgh 
templates-contrib http://viewvc.tigris.org/svn/viewvc/templates-contrib/1.1
$ cat svn-uPRHwv  
templates-contrib -r2534 http://viewvc.tigris.org/svn/viewvc/templates-contrib/1.1
$