svn:mergeinfo resurrecting from the dead

Hi there,

I have read all the info I have been able to found with Google regarding svn:mergeinfo but I have come across a case that does not seem to be covered in the internet archives.

I had 60 odd files sparsely distributed in my trunk which contained the svn:mergeinfo property (from a partial merge done by a member of my team) and I wanted to get rid of those since they were cluttering up my merging branches. So what I did is to delete the svn:mergeinfo property from all files in the trunk except for the root of the trunk itself.

My trunk is now clean of svn:mergeinfo, i.e. this:

trunk$ svn propget svn:mergeinfo --depth=infinity
returns only merge info in the root of trunk, which is fine.

When I create a branch it 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 the original bunch of 60 odd files get the svn:mergeinfo property added. So the properties are not on the trunk, not on the branch, they appear magically whenever I update the branch with the trunk. I am trying to find out where can these properties be stored since I completely removed them from the trunk before I created my branch.

Client/Server versions:

Client: svn, version 1.6.11 (r934486) [cygwin]
Server: 1.6.6 (r40053) [Linux]

I can provide log files if required.

Thank you very much in advance!

--
Carles