A Deeper Look at Team Foundation Server 2012 Version Control
5 likes3,490 views
The document discusses version control in Team Foundation Server 2012, including features like server and local workspaces, checking in and out files with different lock types, labeling versions, getting and adding files from version control, and integrating version control with the ALM capabilities in Visual Studio and TFS. It also briefly mentions converting version control repositories from other systems like Visual SourceSafe and ClearCase into TFS.
![versionspec
Changeset [C]n /v:C8
Label Llabel [file];LMyLabelName
Date & Time Dyyyy-mm-ddTxx:xx /version:D2012-03-22
(or any format supported by .NET or on /version:D2012-03-22T09:00
local machine)
Workspace (current) W
Workspace (specified) Wworkspacename; WResolveRIConflicts;PeterW
workspaceowner
Tip T](https://image.slidesharecdn.com/tfs2012versioncontroloverview-121203122838-phpapp02/85/A-Deeper-Look-at-Team-Foundation-Server-2012-Version-Control-28-320.jpg)
![tf get [itemspec] [/version:versionspec] [/all] [/overwrite] [/force] [/remap]
[/recursive] [/preview] [/noautoresolve] [/noprompt]
[/login:username,[password]]
tf get *.cs /recursive
tf get program.cs;8
tf checkout [/lock:(none|checkin|checkout)] [/recursive] [/encoding:encoding]
itemspec [/login: username,[password]]
tf checkout program1.cs program2.c](https://image.slidesharecdn.com/tfs2012versioncontroloverview-121203122838-phpapp02/85/A-Deeper-Look-at-Team-Foundation-Server-2012-Version-Control-29-320.jpg)
![tf checkin [/author:author name] [/comment:("comment"|@comment file)] [/noprompt]
[/notes:("Note Name"="note text"|@notefile)] [/override:(reason|@reasonfile)]
[/recursive] [/saved] [/validate] [itemspec] [/bypass] [/force] [/noautoresolve]
[/login:username,[password]] [/new]
tf checkin /comment:"Re-implemented Pi calculator"
tf checkin program.cs /noprompt
tf label labelname[@scope] [/owner:ownername] itemspec [/version:versionspec]
[/comment:("comment"|@commentfile)] [/child:(replace|merge)] [/recursive]
[login:username,[password]] [/collection:TeamProjectCollectionUrl]
tf label goodbuild /version:3 $/src/314.cs
tf label goodbuild docs /recursive](https://image.slidesharecdn.com/tfs2012versioncontroloverview-121203122838-phpapp02/85/A-Deeper-Look-at-Team-Foundation-Server-2012-Version-Control-30-320.jpg)
![tf stat[us] itemspec [/collection:TeamProjectCollectionUrl]
[/login:username,[password]] ([/workspace:workspacename[;workspaceowner]] |
[/shelveset:shelvesetname[;shelvesetowner]]) [/format:(brief|detailed)]
[/recursive][/user:(*|username)] [/nodetect]
tf stat SolutionA* /recursive
tf add itemspec [/lock:(none|checkin|checkout)] [/encoding:filetype] [/noprompt]
[/recursive] [/noignore] [/login:username,[password]]
tf add *.cs /recursive](https://image.slidesharecdn.com/tfs2012versioncontroloverview-121203122838-phpapp02/85/A-Deeper-Look-at-Team-Foundation-Server-2012-Version-Control-31-320.jpg)
A Deeper Look at Team Foundation Server 2012 Version Control
- 1. A Deeper Look at TFS 2012 Version Control Steve Lange Sr. Developer Technology Specialist
- 4. Web Service SQL Server Version Application backend Control Proxy Communication via Scalable Network-near cache HTTP(S) for versioned artifacts Manageable Runs on IIS
- 21. Check-in Lock Check-out Lock Less restrictive Prevents any changes from being made by others A check-in lock is less restrictive than a check-out lock. Only applies to server workspaces Other users can make local changes, but Can be applied to files with no pending not check in changes anywhere
- 26. Read Read the contents of a file or folder Check out Check out and make a pending change to items in a folder Check in Check in items and revise any committed changeset comments Label Label items Lock Lock and unlock folders or files Revise other user's changes Edit the comments on checked-in files, even if another user checked in the file Unlock other user's changes Unlock files locked by other users Undo other user's changes Undo a pending change made by another user Administer labels Edit or delete labels created by another user Manage permissions Manage other users' permissions for folders and files in version control Check in other user's Check in changes that were made by other users. Pending changes will be committed at check-in changes Merge For a given path can merge changes into this path Manage branch For a given path can convert any folder under that path into a branch. Can also edit properties, re-parent, and convert a branch to a folder
- 28. versionspec Changeset [C]n /v:C8 Label Llabel [file];LMyLabelName Date & Time Dyyyy-mm-ddTxx:xx /version:D2012-03-22 (or any format supported by .NET or on /version:D2012-03-22T09:00 local machine) Workspace (current) W Workspace (specified) Wworkspacename; WResolveRIConflicts;PeterW workspaceowner Tip T
- 29. tf get [itemspec] [/version:versionspec] [/all] [/overwrite] [/force] [/remap] [/recursive] [/preview] [/noautoresolve] [/noprompt] [/login:username,[password]] tf get *.cs /recursive tf get program.cs;8 tf checkout [/lock:(none|checkin|checkout)] [/recursive] [/encoding:encoding] itemspec [/login: username,[password]] tf checkout program1.cs program2.c
- 30. tf checkin [/author:author name] [/comment:("comment"|@comment file)] [/noprompt] [/notes:("Note Name"="note text"|@notefile)] [/override:(reason|@reasonfile)] [/recursive] [/saved] [/validate] [itemspec] [/bypass] [/force] [/noautoresolve] [/login:username,[password]] [/new] tf checkin /comment:"Re-implemented Pi calculator" tf checkin program.cs /noprompt tf label labelname[@scope] [/owner:ownername] itemspec [/version:versionspec] [/comment:("comment"|@commentfile)] [/child:(replace|merge)] [/recursive] [login:username,[password]] [/collection:TeamProjectCollectionUrl] tf label goodbuild /version:3 $/src/314.cs tf label goodbuild docs /recursive
- 31. tf stat[us] itemspec [/collection:TeamProjectCollectionUrl] [/login:username,[password]] ([/workspace:workspacename[;workspaceowner]] | [/shelveset:shelvesetname[;shelvesetowner]]) [/format:(brief|detailed)] [/recursive][/user:(*|username)] [/nodetect] tf stat SolutionA* /recursive tf add itemspec [/lock:(none|checkin|checkout)] [/encoding:filetype] [/noprompt] [/recursive] [/noignore] [/login:username,[password]] tf add *.cs /recursive
- 35. Summary
- 36. Steve Lange sr. developer technology specialist stevenl@microsoft.com @stevelange | http://slange.me
- 37. © 2012 Microsoft Corporation. All rights reserved. Microsoft, Windows, and other product names are or may be registered trademarks and/or trademarks in the U.S. and/or other countries. The information herein is for informational purposes only and represents the current view of Microsoft Corporation as of the date of this presentation. Because Microsoft must respond to changing market conditions, it should not be interpreted to be a commitment on the part of Microsoft, and Microsoft cannot guarantee the accuracy of any information provided after the date of this presentation. MICROSOFT MAKES NO WARRANTIES, EXPRESS, IMPLIED OR STATUTORY, AS TO THE INFORMATION IN THIS PRESENTATION.
- 40. Visual Studio 2012 homepage Downloads Visual Studio 2012 Product Guide Visual Studio 2012 Product Comparison VS 2012 ALM VM and Labs Visual Studio 2012 Readme Visual Studio 2012 Learning Library Articles Videos
- 41. Using Version Control What's New in Version Control Get Started Develop Your App Suspend Your Work Check In Your Work Isolate Risk View and Manage Past Versions Compare Folders and Files Resolve File Conflicts Work with Version Control Locks Version Control Commands
- 42. Converting from Visual SourceSafe SVN (by Timely Migration) ClearCase Bridging with Git SVN Bridge
- 43. ALM with Visual Studio and TFS Cross-Platform Development Extending Team Foundation Server TFS Integration Platform
Editor's Notes
- #4: http://msdn.microsoft.com/en-us/library/ms252473.aspx
- #5: http://msdn.microsoft.com/en-us/library/ms252473.aspx
- #7: Version control security can be applied at any level of scope within a team project (project, branch, folder, file).
- #10: What these companies need are solutions for delivering modern applications. For modern application development there is Visual Studio 2012. Visual Studio 2012 is the development solution for teams and individuals to handle the challenges of modern development. It is a comprehensive solution for creating apps for a variety of Microsoft platforms of any scope from departmental to enterprise. In this talk you will learn more about modern app development and lifecycle and how Visual Studio helps you create applications that your users will love.
- #12: This graphic was published by Gartner, Inc. as part of a larger research document and should be evaluated in the context of the entire document. The Gartner document is available upon request from Microsoft *Gartner does not endorse any vendor, product or service depicted in its research publications, and does not advise technology users to select only those vendors with the highest ratings. Gartner research publications consist of the opinions of Gartner's research organization and should not be construed as statements of fact. Gartner disclaims all warranties, expressed or implied, with respect to this research, including any warranties of merchantability or fitness for a particular purpose