Search code examples
.netsvnversion-controlvb.net

Any tips for using Subversion with .net project files?


We just switched from TFS to SVN, and so far we're loving it.

However, it did introduce a few new issues.

One is the way project files (.vbproj specifically) are handled. The .vbproj file is of course always changing as files and references are changed, and if a few people are collaberating there will be conflicts.

Oddly, in TFS we never had to deal with managing those conflicts, that particular piece was automagically handled. Now in SVN, we're mucking through XML in the merge tool and there have already been some mistakes.

How do you handle this? Any tips?

EDIT: by the way, we're using VisualSVN.


Solution

  • In SVN the main problems with *proj files is when people move files around to different folders, and/or when they add and remove similarly named files simultaneously, usually at the start of the project.

    Once filenames and project structure become more stable this won't happen as much anymore.

    Also, only include the .sln and .vbproj files, don't include the ever-changing .suo files, to reduce headaches.