28
Steve Lange | Developer Technology Specialist | [email protected] | Microsoft

Team Foundation Server Version Control

Embed Size (px)

DESCRIPTION

 

Citation preview

Page 1: Team Foundation Server Version Control

Steve Lange | Developer Technology Specialist | [email protected] | Microsoft

Page 2: Team Foundation Server Version Control

What is Team System & TFSTFS Version ControlQ&A

Page 3: Team Foundation Server Version Control
Page 4: Team Foundation Server Version Control

Data Tier

DataWarehouse

VersionControlWork Items Team Build

SQL Server 2005

Windows SharePoint Services Web Services

Application Tier

SQL Reporting Services

Client Interface

VisualStudio

Team ExplorerMS Project

MS Excel

TFS SDK

Command Line

BuildEnvironment

BuildProcess

Version ControlProxy

VersionControlProxy

Service

Page 5: Team Foundation Server Version Control

Dev Team (Local)Dev Team (Remote)

Business User

TCP/IPHTTP / S

Win 2003 ServerSQL Server 2005IIS 6.0

Team Foundation ServerTeam Foundation Server

Build Server

Version Control Proxy (Remote)Active Directory

Page 6: Team Foundation Server Version Control
Page 7: Team Foundation Server Version Control

Integrated ExperienceMajor Capabilities

ChangesetsWorkspacesBranch And MergeShelving

Page 8: Team Foundation Server Version Control

AtomicA changeset is guaranteed to have all changes from a check-in

IntegratedCheck-in policy applied (but override-able)Work Items associatedBuilds associated with Work ItemsCheck-in notesAll related to changesetPending Check-in WindowNotification possibilities

Check-in PolicyCustomizable, extensible

Page 9: Team Foundation Server Version Control

Logical container of data related to check-inFile and branch informationLinks to work itemsCheck-in notesCommentPolicy complianceMetadata (date, time, user)Unit of atomic checkin

Uniquely identifiedNumeric identifierIncremental

Represents a point in time of source repository

Page 10: Team Foundation Server Version Control

Client side copy of source checked out from repositoryOwned by one user on one machineChanges in workspace create “pending changes”Workspace Mapping = Repository folder mapped to Local Folder

Page 11: Team Foundation Server Version Control

12121212V5V5V5V5

999912121212444412121212

Changeset 12Changeset 12Changeset 12Changeset 12

WorkItem 158WorkItem 158WorkItem 158WorkItem 158

ValidateValidatePoliciesPolicies 11

Checkin PolicyCheckin PolicyEngineEngine

Checkin PolicyCheckin PolicyEngineEngine

Check

in T

est

sC

heck

in T

est

s

Work

Ite

ms

Work

Ite

ms

Cust

om

Polic

yC

ust

om

Polic

y

Sta

tic

An

aly

sis

Sta

tic

An

aly

sis

CommitCommitChangesChanges

22

Checkin EventCheckin Event

UpdateUpdateWork ItemsWork Items

33

Checkin MailCheckin Mail

44

ArtifactArtifactLinkLink

WorkspaceWorkspace

Page 12: Team Foundation Server Version Control

BranchA branch relationship is created in TFS to avoid duplication of history and metadataPath-space branchingIntelligent copies

MergeSync a branch into anotherCherry Picking changesets (include or omit)Ability to show changes that have not been merged

Page 13: Team Foundation Server Version Control

Set aside pending changes without checkin

Optionally revert to unmodified filesRestore shelved changes by “unshelving”Unshelve other user’s changes

Power of task branching with less overhead

ShelvingShelving

Developer

Switch TasksSwitch Tasks

BackupBackup Work-In-ProgressWork-In-Progress

CheckpointCheckpoint Work-In-ProgressWork-In-Progress

Share Share Work-In-ProgressWork-In-Progress

Perform a Code ReviewPerform a Code Review

Page 14: Team Foundation Server Version Control

TFS not bound to .NETAny file typeAny file size

Integration SupportEclipse Plug-inJava client + command line

MS SCCI ProviderMultiple IDE’s

Page 15: Team Foundation Server Version Control
Page 16: Team Foundation Server Version Control
Page 17: Team Foundation Server Version Control
Page 18: Team Foundation Server Version Control
Page 19: Team Foundation Server Version Control
Page 20: Team Foundation Server Version Control
Page 21: Team Foundation Server Version Control
Page 22: Team Foundation Server Version Control
Page 23: Team Foundation Server Version Control
Page 24: Team Foundation Server Version Control
Page 25: Team Foundation Server Version Control

Questions?

Page 26: Team Foundation Server Version Control
Page 27: Team Foundation Server Version Control

TFS Best Practices GuideSOX Compliance & Team SystemRequirements Management Whitepaper

Steve’s Blog on RM and TFS

Brian Harry’s Blog (Microsoft TFS Adoption)Team System “Widgets” (comprehensive integrations & utilities list)Videos: “How Do I?” | VSTSRocks.comOnline Training Options

Page 28: Team Foundation Server Version Control