> We are having problems with a large number of svn:mergeinfo > properties > being modified each time we merge. These svn:mergeinfo are on > unrelated > files to the actual change being made. Though it does seem as if > they > correlate to prior merges that have happened. If we commit these > property changes they will happen again the next time we merge. > > At this point when we merge we will see 80 files with svn:mergeinfo > changed when we might only be merging one file. It's becoming > difficult > to determine what exactly we have changed. > > I looked in the FAQ and googled and nothing exactly seemed to match > what > we are seeing. > > Mostly, we have TortoiseSVN 1.6.8 / Subversion 1.6.11 on the client > and > svn 1.6.15 on our server. The repository is old, having had nearly > every major version of SVN that ever existed. > > We merge sometimes from our "trunk" to a branch and sometimes from > our > branches back to trunk. We often have multiple releases in flight > so a > fix will be merged from ^/branches/7.00.39 to ^/branches/7.00.40 > and > then to ^/branches/7.00.41 and then to ^/trunk. Or the reverse. > > At some point people were reverting the svn:mergeinfo properties > and > performing the checkin because they didn't know what they did. > Nobody > should be doing that any more. > > Any help would be appreciated.
This is a pretty common complaint people have, I'm surprised you couldn't find any threads about it. If I were writing an svn merging FAQ this would probably be question number 1 or 2. What is most likely happening is that you have mereinfo on your child nodes that is not present in your root node. This usually happens when someone does a merge for a specific file or folder rather than doing the merge at the project root. I was going to write all about this, but quickly was able to find this article on line that saves me much typing. http://blog.syntevo.net/2011/03/16/1300268640000.html BOb
