Create a repository with some properties
svnadmin create repo
svn co file://`pwd`/repo wc
svn ps xx xx wc
svn ci -m "" wc
svn up wc
now merge the property change
svn merge -r1:0 wc wc
U wc
The feedback indicates a property change, and yes it has changed
svn pl -v wc
shows that the property has been deleted, that is correct. However
svn st wc
doesn't show a modification and
svn ci wc
doesn't commit anything. That's because merge has modified the base
properties as well as the working properties. Naughty!
Doing the same thing on a file instead of a directory gives a related,
but less serious bug
touch wc/foo
svn add wc/foo
svn ci wc
svn ps xx xx wc/foo
svn ci wc/foo
svn up wc
This time the merge
svn merge -r3:2 wc wc
wc/bar
gives odd output, notice there is no feedback letter. It turns out
that neither the working props or the base props have been changed.
The property merge has no effect, but at least it doesn't corrupt the
working copy.
Major