Qt/C++ project VS2010 svn-commit&update .sln

Question

Using Tortoise-svn with C++ VS2010 project. I would like to know in which cases you are to commit .sln file.

Some reasons I see for commiting .sln file:

• some projects were added to solution
• dependencies were modified

What other reasons for commiting .sln ? How would .sln be merged ?

Also, who is generating .sln file ? Is it generated at each qmake_all (or make_all) ?

EDIT

I am using Tortoise SVN GUI. It should tell me when .sln has been changed by me.

Now, under which circomstances is .sln changed ?

And also: how are .sln merged ?

More pragmatically, in which case should I do accept mine or accept theirs for .sln when I just updated ?

EDIT

When/How is .sln produced from .pro file ?

EDIT

To make part of my question clearer:

after an update with tortoise svn, if .sln is conflicted, should i

• accept mine (since anyway .sln will be regenerated from .pro file when i qmakeall) or
• accept theirs (since my .sln is no more up to date)
• or is it not important ?

thanks!

Answer 1

As for me you do not have needs to store sln file, because sln file is derivative from your pro file (in other words sln is generated from pro file), so consider to storage only primary project definition file (this is a pro file) and omit generated artifacts. The primary reason is when you decide to change developer environment (for example it can be mingw) you can do it in the moment with pro file, and spend a lot of time for converting sln file.

Answer 2

通常，任何像TutoiseSVN这样的svn GUI都会检测到解决方案文件中的任何更改，并警告您也提交.sln文件，但是如果您不使用这种GUI，则可以通过打开带有文本的.sln文件来找到相关的解决方案参数。编辑器（如Notepad ++），您可以看到有关项目的所有变量