Presentation is loading. Please wait.

Presentation is loading. Please wait.

Source Control with Team Foundation Server Martin Woodward Teamprise.

Similar presentations


Presentation on theme: "Source Control with Team Foundation Server Martin Woodward Teamprise."— Presentation transcript:

1

2 Source Control with Team Foundation Server Martin Woodward Teamprise

3 Visual Studio Team System

4 Team Foundation Server Work Item Tracking Change Management Reporting Project Site Version ControlSource Control

5 Team System Deployment Dev Team (Local) Dev Team (Remote) Business User TCP/IP HTTP / S Win 2003 Server SQL Server 2005 IIS 6.0 Team Foundation Server Build Server Version Control Proxy (Remote) Active Directory

6 What is Source Control A place to store stuff Historical record of changes over time Allows developers to work in parallel

7 Source Control Basics

8 The Problem of File-Sharing Repository AA Harry AA Sally AA

9 Repository AA Harry A’A’ Sally AA

10 Repository AA Harry A’A’ Sally A’’A’’

11 Harry A’A’ Repository AA A’A’ Sally A’’A’’

12 Sally A’’A’’ Repository A’A’ Harry A’A’A’’A’’

13 Repository A’’A’’ Harry A’A’ Sally A’’A’’

14 Lock, Modify, Unlock Model Repository AA Harry AA Sally AA Lock Read Lock

15 Repository AA Harry A’A’ Sally AA Write Unlock Lock ’ Read ’’

16 Best Practice Small frequent check-ins Do get latest between check-ins Communicate with the team Consider continuous integration Consider branching techniques

17 Copy, Modify, Merge Model Repository AA HarrySally AAAA Read

18 Repository AA HarrySally AAAA ’’’ Write Write ’’

19 Harry Repository Merge AA Sally AAAA ’’’ ’’ AA ’’ * Write * Read *

20 Team Foundation Server Model Lock types:- None Check – out Check – in

21 TFS Concepts: Team Project “A collection of work items, code, tests, work products, metrics, etc that is used by a defined team to track a common set of related work.

22 TFS Concepts: Workspace “Your client-side copy of the files and folders on the source control server.”

23 TFS Concepts: Changeset “A logical container in which Team Foundation stores everything related to a single check-in operation”

24 Shelving Put work on hold Can be thought of as temporary developer branch.

25 Basic source control with Team Foundation Server

26 Key Features Atomic Check in Integrated with Visual Studio Eclipse and Cross-platform support (via partner) Work Item Integration Customizable Check in Behavior WAN Support Large File Support (>4GB) Shelving

27 Team System VC vs VSS X 6 VSS Team System 1.5 hours Full Get 7.5 minutes 15 minutes Get Latest 3 seconds 3.5 seconds Right Click 0 Seconds 4.5 Seconds Navigate 0 Seconds X 25 X 28 Proxy

28 Microsoft “Dogfooding” Version Control Redmond, WA 368 Users Fargo, ND 4 Users Research Triangle, NC 42 Users Copenhagen, Denmark 6 Users Hyderabad, India 14 Users Version Control Users: 864 Number of Files/Folders: 1,507,247/178,953 Compressed File Size: 95.2 GB Workspaces: 1,770 Workspace File Versions: 48.9 Million Changesets: 32,573 Pending Changes: 57,278 Shelvesets: 2,458 Source: http://blogs.msdn.com/buckh/archive/2006/03/22/brownbag.aspx http://blogs.msdn.com/buckh/archive/2006/03/22/brownbag.aspx

29 Capacity Planning Team Size TFS Config ModelCPUMemoryDisk 100 Single Server Dell PowerEdge 1850 1 x 3.4Ghz 1GB 1 x 10k rpm SCSI 200 Single Server Dell PowerEdge 1850 1 x 3.4Ghz 2GB 1 x 10k rpm SCSI 400 Single Server Dell PowerEdge 1850 2 x 3.4Ghz 2GB 1 x 10k rpm SCSI 800 Dual Server HP Proliant DL580 G2 AT: 1 x 2.8Ghz DT: 2 x 2.7Ghz AT: 1GB DT: 4GB 12 x 15k SCSI Raid 0 2000 Dual Server HP Proliant DL580 G2 AT: 1 x 2.8Ghz DT: 4 x 2.7Ghz AT: 1GB DT: 16GB 12 x 15k SCSI Raid 0 3500 Dual Server Dell PowerEdge 1850 Unisys ES7000/600 AT: 2 x 2.8Ghz DT: 8 x 2.8Ghz AT: 4GB DT: 32GB XIOTech SAN (2TB, RAID 10) Source: http://blogs.msdn.com/bharry/archive/2006/01/04/509314.aspx

30 Update Terminology – CVS / Subversion Check Out

31 Check in Terminology – VSS / TFS Check Out Get Latest

32 Check out != Get Latest 1 1 Get Latest 23 3 Edit Pending on Version 3 Check in 4

33 Check out != Get Latest 1 1 Get Latest 23 Edit Pending on Version 1 Attempted Check in Check in 4 Get Latest

34 Branching and Merging Source: http://downloads.seapine.com/pub/papers/SCMBranchingModels.pdf

35 Recommended File Structure

36 TFS Branching Features Path-space branching Support for merging changes Branch from any point in history Cherry Pick Changesets

37 Branching and Shelving with Team Foundation Server

38 Win 2003 Server SQL Server 2005 IIS 6.0 Team Foundation Server Team Foundation Server Clients

39 Visual Studio 2005 Team Explorer Microsoft Command Line Client Visual Studio 2003 / Visual Studio 6 Teamprise Eclipse Plugin Teamprise On Mac TeampriseExplorer Teamprise Command Line Client Teamprise On Linux Teamprise On Sun / SPARC Team Foundation Server

40 Example Report

41

42 Learning More Eric Sink’s Source Control HOWTO http://software.ericsink.com/scm/ http://software.ericsink.com/scm/ Subversion Book http://svnbook.red-bean.com http://svnbook.red-bean.com Rob Caron’s Blog: http://blogs.msdn.com/robcaron http://blogs.msdn.com/robcaron Team System Rocks: http://www.teamsystemrocks.com http://www.teamsystemrocks.com Microsoft http://www.microsoft.com/teamsystem http://www.microsoft.com/teamsystem VSTS Virtual Lab http://shrinkster.com/emj http://shrinkster.com/emj

43 Question and Answer Martin Woodward Senior Software Engineer Teamprise martin@teamprise.com www.teamprise.com Slides: http://www.woodwardweb.com

44 Team System Pricing Source: http://msdn.microsoft.com/vstudio/howtobuy/ (April 2006)

45


Download ppt "Source Control with Team Foundation Server Martin Woodward Teamprise."

Similar presentations


Ads by Google