SVN mergeinfo property and branches

Question

Here we go again with svn:mergeinfo. I have read all the Q/A regarding it but I have come across a case that does not seem to be covered in the existing posts here. My trunk is clean of svn:mergeinfo, ie this:

svn propget svn:mergeinfo --depth=infinity

returns only merge info in the root of trunk, which is fine. The I create a branch, and that branch is fine too, with svn:mergeinfo only at the root of the branch. But then I try to update the branch with the latest trunk like so:

svn merge http://xxxxx/trunk

And then a bunch of files (60 or so) get the svn:mergeinfo property added. Please note that I had this problem earlier when the 60 files had the mergeinfo property set on trunk, and I deleted it from the trunk, and then branched off the trunk. So the properties are not on the trunk, not on the branch, they appear magically whenever I update the branch with the trunk.

Any ideas?

Answer 1

This is svn 1.5 bug. SVN Mergeinfo properties on paths other than the working copy root

Try to remove them:

Useful commands Get mergeinfo on all tree, the XML format is needed to create readable output: svn propget svn:mergeinfo --recursive --xml

Delete mergeinfo on tree except root (the merge target) svn propdel --recursive svn:mergeinfo ./*

read more: Remove unnecessary svn:mergeinfo properties