Merging of Branched Projects recursively in VSS 6.0 d

Question

Hi All:

We have VSS 6.0d installed in our server and created a Repository through VSS Admin.

In that repository, We've branched a project (X) into 2 branches B1 and B2 as the same code is reqd for other clients.

Developers are working parallely on both Branches.

In few days, we would to like merge all the changes made in Branch B1 - all folders & files  to X recursively.

Through VSS Commands, is there any way to merge the changes from a Branched Project to the Main Project recursively?

Note: We are having VSS 6.0d version

 

Thanks,

David.

Answer 1

Hi David,

In SourceSafe, branching is done at a file level. If you want to merge the projects recursively, I recommend you upgrade your VSS to VSS 2005.

In VSS 2005, you can use "ss.exe merge" command to merge the projects. The command accepts a -R argument to do recursive merge.
http://msdn.microsoft.com/en-us/library/d6x776hk(VS.80).aspx

 

---

Catherine Sea
Version Control Software | Software Configuration Management Solution

Answer 2

Hi Catherine,

Thanks for the info.

David.