When I merge stuff in my repository Subversion wants to add/change a lot of svn:mergeinfo properties to files that are totally unrelated to the things that I wa
svn:mergeinfo
Here is another way to delete all sub tree svn:mergeinfo properties but not at the root folder (this is needed for branching to work properly).
From the root of the project do:
svn propdel svn:mergeinfo -R svn revert . svn ci -m "Removed mergeinfo"