RE: svn merge issues after upgrading server from 1.4.3 to 1.6.6 - unexpected property changes (deleted svn:mergeinfo)
From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Thu, 25 Mar 2010 15:04:47 -0400
> We recently upgraded our subversion server software and are having major
Eww... not sure how great an idea it is to use a pre 1.5 server with 1.5 and 1.6 clients. Although I'm not 100% sure of the ramifications... it could just be a performance issue and the client has to do more work to walk the tree of mergeinfo properties. Perhaps someone that knows a bit more about that issue will chime in here.
As you know a " M" (Space in first col M in second column) indicates that the properties where changed but not the file itself.
> % svn diff Docs/
This shows that you do have mergeinfo on your files. So, at some time someone did a merge probably at the Docs level or directly to a file which added the mergeinfo. Now you are doing it at a higher folder level so the data is being elided. There's not really anything wrong here.
You might want to train your devs to always do merges at the same folder level to prevent all the merge data on child folders and files. If they weren't there then they wouldn't be elided.
> A mix of subversion clients have been in use, including 1.4, 1.5 and 1.6
I assume it doesn't happen when you use a 1.4 client... since this version doesn't include the merge tracking functionality.
> Can anyone provide any guidance, clues, pointers, etc. to what we need to
I think there is nothing you can do to address it. But, to solve your problem you may just want to pipe the output to grep (or something) and ignore files with a status of " M"
You might also want to upgrade your server... 1.4.x is pretty old and not supported with updates.
I hope this helps.. sorry AFAIK there is no magic answer to make this easier.
This is an archived mail posted to the Subversion Users mailing list.