Is there a way to turn TortoiseSVN using svn:mergeinfo off?

Question

When I\'m doing a TortoiseSVN merge, it includes a bunch of directories, and some files into the modified files, even though there are no actual changes.

It changes

Answer 1

We removed it recursively on our project because just about all files had this info which made mergeing very annoying (if only one file had been altered, all files had to be merged). From now on we'll only merge on the root, which should avoid this situation in the future.

It hasn't given us any problems so far. Logging is still available on files and seems to be the same (but do it at your own risk anyway!).

Oh, we did it on our trunk, just before making a new branch. This way, we can start from a clean slate.

Answer 2

If you tick Ignore ancestry it will not create svn mergeinfo in the folders. If you got the svn merge information already, just revert it and do the merge again by checking the ignore ancestry.

Answer 3

We also had this problem in my team, and it made the whole merge process a bit confusing. After reading this, I tried deleting the svn:mergeinfo property from a number of files, and after some further testing it looks like that solved the problem.

Answer 4

That is happening, very likely, because those files and directories have the svn:mergeinfo property set from a previous merge. I don't think it's generally a good idea to merge individual files or directories in a way that causes the mergeinfo to be written to individual files. You should get into the habit of merging at the highest level possible for your workflow, so that the mergeinfo property is only set on structural directories, such as /trunk or /branches/1.0.

However, if you do find yourself with mergeinfo properties on individual files and folders, there are two things you can do: the first thing is simply to remove the svn:mergeinfo property from the files and directories in question. I'm not sure this is recommended unless you really know what you're doing, and what the effects might be. Read the documentation before you do this!

The second thing you can do is commit the property changes the way SVN wants you to, which, if you trust the software, is probably the right thing do.

That having been said, I've been working with my teammates to get in the right habits so that we don't have this annoyance any more.