1.8 bug(?): svn:mergeinfo set for tree-conflicted files in subdirs
From: Pete Harlan <pchpublic88_at_gmail.com>
Date: Wed, 11 Mar 2015 15:16:09 -0700
Subversion 1.8.11 behaves differently than 1.7.17 and 1.6.11, in that
Add empty dir/file.txt to trunk and independently to branch.
% svn propget -v svn:mergeinfo -R
Expected result is that no svn:mergeinfo property would appear on
Script to reproduce (run as "script.sh /path/to/svn"):
if [ $# != 1 ]; then
# Create the repo and enter it.
# Create the trunk/branches structure
# Make a branch from the trunk.
# Commit a subdir with a file in it in the trunk and commit it.
# Commit a subdir with a file in it in the branch and commit it.
# Merge the trunk and display any svn:mergeinfo properties.
echo '. - /trunk:2-4' >expected.out
$SVN --version | head -1
if diff -q actual.out expected.out; then
This is an archived mail posted to the Subversion Users mailing list.