Team Foundation Server 2010 - Version Control

40,952 views

Published on

General overview of the version control capabilities of Team Foundation Server 2010.

Published in: Technology
0 Comments
9 Likes
Statistics
Notes
  • Be the first to comment

No Downloads
Views
Total views
40,952
On SlideShare
0
From Embeds
0
Number of Embeds
2,144
Actions
Shares
0
Downloads
1,738
Comments
0
Likes
9
Embeds 0
No embeds

No notes for slide

Team Foundation Server 2010 - Version Control

  1. 1. Team Foundation Server 2010<br />Version Control<br />Steve Lange<br />Developer Technology Specialist – Microsoft<br />stevenl@microsoft.com | blogs.msdn.com/slange<br />
  2. 2. Agenda<br />What is Team Foundation Server?<br />Focus: Version Control<br />Architecture<br />Key Concepts<br />Changesets<br />Integrated Check-in<br />Check-in Policies<br />Workspaces<br />Shelving<br />Other Version Control Concepts<br />Labeling<br />Compare/Diff<br />Annotation<br />Branching & Merging<br />General Misconceptions<br />Integration with Other TFS Components<br />Q&A<br />
  3. 3. Visual Studio 2010<br />
  4. 4. What is Team Foundation Server?<br />Team Foundation Server<br />A unified project server<br />Developer<br />Designer<br />Database Professional<br />Architect<br />Tester<br />ProjectManager<br />BusinessAnalyst<br />
  5. 5. Team Foundation Server At a Glance<br />Team Foundation Server<br />
  6. 6. Architecture<br />Client Interface<br />Build<br />Environment<br />Visual<br />Studio<br />MS Excel<br />Command Line<br />Version Control<br />Proxy<br />Build<br />Process<br />Version<br />Control<br />Proxy<br />Service<br />Team Explorer<br />MS Project<br />TFS SDK<br />Application Tier<br />Windows SharePoint Services<br />Web Services<br />SQL Reporting Services<br />SQL Server<br />Data<br />Warehouse<br />Version<br />Control<br />Work Items<br />Team Build <br />Data Tier<br />
  7. 7. Team Foundation Server Deployment<br />Dev Team (Remote)<br />Dev Team (Local)<br />Build Server<br />Business User<br />Win 2003 Server<br />SQL Server 2005<br />IIS 6.0<br />Version Control Proxy (Remote)<br />Active Directory<br />HTTP / S<br />TCP/IP<br />Team Foundation Server<br />
  8. 8. TFS Version Control: Key Concepts<br />Changesets<br />Integrated Check-in<br />Check-in Policies<br />Workspaces<br />Shelving<br />
  9. 9. Changesets<br />Logical container of data related to check-in<br />File and branch information<br />Links to work items<br />Check-in notes<br />Comment<br />Policy compliance<br />Metadata (date, time, user)<br />Unit of atomic checkin<br />Uniquely identified<br />Numeric identifier<br />Incremental<br />Represents a point in time of source repository<br />
  10. 10. Integrated Check-in<br />
  11. 11. Check-in Policies<br />Requirements for Check-in<br />Overridable<br />Extensible<br />
  12. 12. Workspaces<br />
  13. 13. Shelving<br />Switch Tasks<br />Perform a Code Review<br />Backup<br /> Work-In-Progress<br />Checkpoint<br /> Work-In-Progress<br />Developer<br />Share <br />Work-In-Progress<br />Set aside pending changes without checkin<br />Optionally revert to unmodified files<br />Restore shelved changes by “unshelving”<br />Unshelve other user’s changes<br />Power of task branching with less overhead<br />Scenarios<br />
  14. 14. Other Version Control Concepts<br />Labeling<br />Compare/Diff<br />Annotation<br />Branching & Merging<br />
  15. 15. Labeling<br />“Bookmarks” version control artifacts<br />Many uses<br />Mark Builds, Releases<br />Group Items<br />Label-based Branch or Merge<br />
  16. 16. Compare/Diff/Merge<br />
  17. 17. Branching & Merging<br />
  18. 18. Visual Branching<br />Branches are “First Class” citizens<br />Visualize branch relationships<br />Track change across branches<br />History<br />Timeline<br />Richer Annotate<br />Conflict resolution<br />
  19. 19. Understanding Parallel Development<br />
  20. 20. Common Misconceptions<br />
  21. 21. Integration with Other TFS Components<br />TFS Version Control<br />
  22. 22. Integration with other TFS Components<br />Version Control<br />
  23. 23. Sample Reports<br />
  24. 24. Thank You!<br />Questions?<br />
  25. 25.
  26. 26. Contact Info<br />
  27. 27. Links & Resources<br />TFS Best Practices Guide<br />SOX Compliance & Team System<br />Requirements Management Whitepaper<br />Steve’s Blog on RM and TFS<br />Brian Harry’s Blog (Microsoft TFS Adoption)<br />Team System “Widgets” (comprehensive integrations & utilities list)<br />Videos: “How Do I?” | VSTSRocks.com<br />Online Training Options<br />

×