Remove unnecessary svn:mergeinfo properties

Question

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

Answer 1

Rather than just blindly deleting the mergeinfo properties, it's also possible to complete the "missing" merges.

Copy the mergeinfo property from the root folder, and then perform a merge on the child folder for the appropriate relative path and the exact same revision list. (You can, but do not need to, only list the differences between this list and the one already on the child folder.)

Normally this merge should end up only changing the mergeinfo properties, not any actual files. (If it does end up changing files, then one of the previous merges must have only been a partial merge, which may have been causing you problems anyway.)

Doing this should end up deleting the mergeinfo property for you, once you've gotten them both to match exactly. You may also need to do the reverse: merge into the root any merge revisions only present on the child folder (again, you can just paste the full list and let SVN sort out finding the differences for you).

Answer 2

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"