Thanks for the clarification Ian, good to know you're lurking here too.Tom

2008/10/10 Ian Olsen <[EMAIL PROTECTED]>

>
> This has nothing to do with CruiseControl.NET, but as a Vault developer I
> just wanted to chime in with a correction about Vault:
>
> Vault will happily merge solution and project files if you add their
> extensions (e.g. sln and csproj) to the list of mergeable file types. This
> will also mean that if you're using non-exclusive locks, these files can be
> non-exclusively locked.  We don't ship this way by default because merging
> project/solution files is often a bit trickier than merging code, and it
> makes more sense to allow people who understand that to "opt in."
>
> There's some more information about this on our support forum here:
> http://support.sourcegear.com/viewtopic.php?f=13&t=9672#p39064
>
> Sorry for being off topic.  Back to your regularly scheduled ccnet
> discussion. :)
>
> --
> Ian Olsen
>
>
> Tom Fanning wrote:
>
>> In general, the more of your code base you have under source control the
>> better. With a VS-based project, your project and solution files are a
>> given. If the application has a database, get the schema (or scripts to
>> generate one) checked in too. Some go so far as to put even the tools
>> required to build the source into source control along with the source
>> itself.
>>
>> .sln and .csproj files are just text-based, nothing too crazy. My source
>> control (Sourcegear Vault) doesn't like merging them though, so it requires
>> exclusive locks. This may be the key part that have caused issues for your
>> predecessors - just make sure that anything referred to in the .sln and
>> .csproj files also exists in your source tree.
>>
>> Feel free to come back if you have further questions :-)
>>
>
>

Reply via email to