250 likes | 460 Views
Team Foundation Server 2010. Version Control. Wanderson Lima Consultor de ALM wanderson.lima@especificacoes.com. Agenda. What is Team Foundation Server? Focus: Version Control Architecture Key Concepts Changesets Integrated Check-in Check-in Policies Workspaces Shelving
E N D
Team Foundation Server 2010 Version Control Wanderson Lima Consultorde ALM wanderson.lima@especificacoes.com
Agenda • What is Team Foundation Server? • Focus: Version Control • Architecture • Key Concepts • Changesets • Integrated Check-in • Check-in Policies • Workspaces • Shelving • Other Version Control Concepts • Labeling • Compare/Diff • Annotation • Branching & Merging • General Misconceptions • Integration with Other TFS Components • Q&A
What is Team Foundation Server? • Team Foundation Server • A unified project server Developer Designer Database Professional Architect Tester ProjectManager BusinessAnalyst
Team Foundation Server At a Glance Team Foundation Server
Client Interface Build Environment Visual Studio MS Excel Command Line Version Control Proxy Version Control Proxy Service Build Process MS Project Team Explorer TFS SDK Application Tier SQL Reporting Services Windows SharePoint Services Web Services SQL Server Work Items Version Control Team Build Data Warehouse Data Tier Architecture
Dev Team (Remote) Dev Team (Local) Build Server Business User Win 2003 Server SQL Server 2005 IIS 6.0 Version Control Proxy (Remote) Active Directory HTTP / S TCP/IP Team Foundation Server Team Foundation Server Deployment
TFS Version Control: Key Concepts • Changesets • Integrated Check-in • Check-in Policies • Workspaces • Shelving
Changesets • Logical container of data related to check-in • File and branch information • Links to work items • Check-in notes • Comment • Policy compliance • Metadata (date, time, user) • Unit of atomic checkin • Uniquely identified • Numeric identifier • Incremental • Represents a point in time of source repository
Check-in Policies • Requirements for Check-in • Overridable • Extensible
Perform a Code Review Switch Tasks Backup Work-In-Progress Checkpoint Work-In-Progress Developer Share Work-In-Progress Shelving • Set aside pending changes without checkin • Optionally revert to unmodified files • Restore shelved changes by “unshelving” • Unshelve other user’s changes • Power of task branching with less overhead Scenarios
Other Version Control Concepts • Labeling • Compare/Diff • Annotation • Branching & Merging
Labeling • “Bookmarks” version control artifacts • Many uses • Mark Builds, Releases • Group Items • Label-based Branch or Merge
Visual Branching • Branches are “First Class” citizens • Visualize branch relationships • Track change across branches • History • Timeline • Richer Annotate • Conflict resolution
Integration with Other TFS Components TFS Version Control
Integration with other TFS Components Version Control
Thank You! Questions?