I performed a merge on a single file, and got erroneous extra property
changes applied to the file.
In particular, I ran this command this morning, within my working copy
of /trunk/doc/book/book:
svn merge http://svn.collab.net/repos/svn/trunk/doc/book/book/ch04.xml
http://svn.collab.net/repos/svn/branches/broken-book/doc/book/book/ch04.xml
ch04.xml
The result was "UU", and my status is now "MM". If you look at the
properties, you'll see that a bunch of erroneous svn:entry: props and
an svn:wc: prop were added to the file:
$ svn pl -v *.xml
Properties on 'ch02.xml':
svn:mime-type : text/xml
Properties on 'ch03.xml':
svn:mime-type : text/xml
Properties on 'ch04.xml':
svn:wc:ra_dav:version-url :
/repos/svn/!svn/ver/3779/trunk/doc/book/book/ch04.xml
svn:mime-type : text/xml
svn:entry:committed-rev : 3779
svn:entry:committed-date : 2002-11-14T00:37:56.897769Z
These wc props and entry props should have been filtered out by
svn_categorize_props in ra_dav. It appears that somehow we're just
applying them to the working copy simply because they all start with
"svn:".
I'm about to commit my local mods to trunk, but the reproduction
recipe is pretty simple. Just make a branch, change a file on the
branch, and then attempt to merge the branch-files' changes back into
your working copy.
Major