Hi,
Our environment: Vault Server 3.16, Clients 3.16 to 3.19.
Currently we use VSS mode for "Concurrent Development Style" in Vault Client option. Because this is the default setting when the Vault client is installed. Some of our developers has requested to switch to CVS mode. The reasons are:
- Vault is smart enough to resolve the merge automatically. In case manual intervention is needed, the developers still know pretty well how to
make a decision.
- No need to wait when someones has checked out a file, especially solution or project file.
- Each developer works at their own pace. There is no "pressure" to check in a file in a rush in case someone needs it.
Question 1: Is there any way to set CVS mode for all Vault Clients which are already installed?
Question 2: How to default Concurrent Development Style = CVS mode automatically at installation time (of Vault Client)?
Question 3: Can you describe the main advantages/drawbacks of each of the settings (CVS vs VSS mode). And What is the reason for VSS to be the default mode?
Question 4: How would Vault Server react if the Vault clients mix CVS and VSS modes? For example, would the Vault clients who change to CVS corrupt something (on Vault Server or VS.NET binding, etc.) if they work on the same project than those who still remain with VSS mode?
Question 5: Other post mentioned that Solution and Project files are not mergeable. They will be exclusively ckecked out regardless of VSS or CVS mode. As these files are actually XML files, is it OK to change them to mergeable?
Thanks very much in advance for any help.
Concurrent Development Style: Please advise good practice
Moderator: SourceGear
Q1: That needs to be set individually.
Q2: Can't do it currently. Again, that's an individual choice.
Q3: We sort of show ourselves as the alternative to VSS, so the focus was to be an easy switch for VSS users. In our KB Article Index there is a section called Product Info/Shameless Marketing where we detail out the differences between us and CVS and VSS. That might help explain a little better.
Q4: It shouldn't matter if it's mixed. One can work concurrently in either mode. In the VSS mode, it is likely that either the Admin tool is set to require exclusive check-outs, or your users have their clients set for exclusive checkouts. Check the Admin tool under repository options and the Vault client under Tools - Options - General to make sure exclusive check-outs aren't set. Also, when users check out, they can check a box for an exclusive check out there too, so they need to make sure that is unchecked. Both modes allow for concurrent development.
Q5: You can add the .sln and .csproj files to the mergeable files list and perform merges on them. I think it may be against some "Best Practices" or if multiple users are editing the same exact lines, it may have a merge conflict. Technically you can do it, but proceed with caution and watch what Visual Studio makes of all that.
Q2: Can't do it currently. Again, that's an individual choice.
Q3: We sort of show ourselves as the alternative to VSS, so the focus was to be an easy switch for VSS users. In our KB Article Index there is a section called Product Info/Shameless Marketing where we detail out the differences between us and CVS and VSS. That might help explain a little better.
Q4: It shouldn't matter if it's mixed. One can work concurrently in either mode. In the VSS mode, it is likely that either the Admin tool is set to require exclusive check-outs, or your users have their clients set for exclusive checkouts. Check the Admin tool under repository options and the Vault client under Tools - Options - General to make sure exclusive check-outs aren't set. Also, when users check out, they can check a box for an exclusive check out there too, so they need to make sure that is unchecked. Both modes allow for concurrent development.
Q5: You can add the .sln and .csproj files to the mergeable files list and perform merges on them. I think it may be against some "Best Practices" or if multiple users are editing the same exact lines, it may have a merge conflict. Technically you can do it, but proceed with caution and watch what Visual Studio makes of all that.
Since most user options are stored in the database, it might be possible to reset user options via a SQL query. However, users can always change back.
Regarding CVS vs VSS mode: Visual Studio does not work properly with CVS mode. VS expects the checkin-checkout model. While VS 2005 supports working without checking items out first, Vault integration doesn't yet support CVS style with Visual Studio. I believe that's coming in Vault 4.0/Fortress.
Regarding CVS vs VSS mode: Visual Studio does not work properly with CVS mode. VS expects the checkin-checkout model. While VS 2005 supports working without checking items out first, Vault integration doesn't yet support CVS style with Visual Studio. I believe that's coming in Vault 4.0/Fortress.
Linda Bauer
SourceGear
Technical Support Manager
SourceGear
Technical Support Manager