Orcas Merge Enhancements

Based upon customer feedback(both external and internal), we have made a number of improvements to the merging experience in Orcas. Below are some of the most significant changes: 1. I described how to handle namespace conflicts while merging in my previous blog (Namespace conflicts while Merging). We have changed the default behavior to automatically perform…

1

New CommandLine Option for Branch in Orcas

In Orcas we have added an additional option to the branch command which gives the user a fast way to create a branch without having to download any of the files or get operations locally. The option is /silent and instructs the server to not send back any get operations. Ofcourse this means you will…

3

Compatibility of Check-in Policies between Whidbey and Orcas

Team Foundation Version Control provides an extensible check-in policy framework to configure and run validation rules before checking in source code. There are many posts that explain how to configure built-in policies as well as install custom ones (refer, for example, http://www.edwardbakker.nl/PermaLink,guid,8600ae36-f9c9-4e1f-b91e-63a469b6346e.aspx and http://www.codeplex.com/VSTSGuidance/Wiki/View.aspx?title=How%20to%20create%20a%20custom%20check-in%20policy&referringTitle=Source%20Control%20Practices%20at%20a%20Glance).   I recently helped an internal user with policy compatibility issues…

1

Using Team Foundation Server Proxy for extranet deployment

Team Foundation Server utilizes a Proxy to improve performance by caching copies of source control files. The Proxy is situated in a remote location, local to the developer needing the files but away from the main server. The remote office is typically connected to the main server through a slow link. The Proxy helps each…

2

Namespace conflicts while Merging

I thought I would talk about namespace conflicts while merging. A namespace conflict occurs when 2 items try to occupy the same slot in the tree. The main reasons for namespace conflicts during merge are: – Items with the same name are created in 2 branches without a merge relationship established between them, below is…

2

Destroy: A new feature for Orcas

Brian Harry mentioned the new Destroy feature in his TFS roadmap post. I thought I would go into a little bit more detail on how destroy works in Orcas. Please do keep in mind that any of this might change / be removed before Orcas ships – so there are no guarantees. Destroy gives you…

6

The Deceptive Allure of Merging with Labels

Labels are an interesting part of version control system. In version 1 of TFS Version Control, labels do not contain deleted items.  Here’s an example sequence of commands that shows this behavior:  mkdir direcho dir\a.cs > dir\a.csecho dir\b.cs > dir\b.cstf add dir /rtf checkin /itf delete dir\a.cstf checkin /itf label label1 $/;T /rtf lables label1 /format:detailed The labels command…

4

Subscribing to TFS notifications using SOAP without a web service

Team Foundation Server provides an event notification mechanism via SOAP or email delivery. My post below discusses a SOAP subscription that uses just a TCP socket listener and does not require a web service implementation. This is convenient for client applications such as test automation. http://blogs.msdn.com/mrod/archive/2006/09/18/761174.aspx  Vasu Sankaran  

1