mariorod@microsoft.com @mariorod1 source control models

Flexible Source Control with TFS and Git

Mario RodriguezProgram Manager3-320

mariorod@microsoft.com

@mariorod1

source control models

centralized OR distributed

centralized - scales to large code bases

distributed - best in class offline experience

Modern source-control approaches

Check-inCheck-out

Server workspaces

Strengths Best for

Modern source-control approaches

Check-inCheck-out

EditCommit

• Scales to very large codebases

• Fine level permission control

• Allows usage monitoring

• Large integrated codebases

• Control and auditability over source code down to the file level

Local workspaces

Centralized Version Control

Strengths Best for

Modern source-control approaches

Check-inCheck-out

EditCommit

DistributedVersion Control

• Scales to very large codebases

• Fine level permission control

• Allows usage monitoring

• Large integrated codebases

• Control and auditability over source code down to the file level

• Offline editing support

• Easy to edit files outside Visual Studio or Eclipse

• Medium-sized integrated codebases

• A balance of fine-grained control with reduced friction

• Full offline experience

• Complete repository with portable history

• Simplified branching model

• Modular codebases

• Integrating with open source

• Highly distributed teams

Modern apps and OSS workflows App Architecture: suite of loosely coupled systems

Team: Written by small/discrete and distributed teams

Platforms: Multiple platforms and development environments (Windows, iOS, Android)

Open source components within proprietary solutions

Changes

we need to embrace DVCS

Git OR Mercurial

Git took offThe Leading DVCS ToolDeployment Protocol

Principles100% true Git … join the community

Fully integratedGit support

Team Foundation Server / Service

Project 2

Issues

Project

MgmtBuild

Git SCC Provider

Project 1

Issues

Project

MgmtBuild

Git

3rd Party XCode

Eclipse

Shell

…

3rd Party Eclipse

Shell

… TFVC

……

TFS SCC Provider

Team Explorer

TFVC Object Model

Local Repo

LibGit2 / LibGit2Sharp

Other Remote

Git Repo

Git-TF

100% true Git love

Principles

100% true Git … join the community

Best distributed VC experience

Enterprise class feature support

Ease of installation

Support and servicing

High availability

Scale

Ease of management

Integrated Authentication

Enhanced permissions

ALM Integration

Localization

Enterprise

User: …. TFS sucks

Us: We are sorry ... Why do you feel that way?

User: Because [reasons] … is a centralized version control

product

Us: We are supporting Git

User: I love TFS!

Us: We love you too

Team Foundation Version Control

(TFVC)

Git(hosted by TFS)

decision at the project level

Demos

In source code workflowsIntegrating the leading DVCS solution into the leading ALM suite

Use centralized or distributed version control and always get the full integrated ALM capabilities of TFS

Choice

In development processPick Agile, CMMI, or Scrum processes or create your own

Tooling to support best of breed practices regardless of your development methodology

Choice

In platformsTarget the platform of your choice from the development environment of your choice

Choice

Ease of installation

Support and servicing

High availability

Scale

Ease of management

Integrated Authentication

Enhanced permissions

ALM Integration

Localization

Enterprise

Team Foundation Service details

Included for certain paid MSDN subscribers:

Free Plan for up to 5 users

Additional information at http://tfs.visualstudio.com

* Capability in preview – limits may apply. Authoring load tests requires Visual Studio Ultimate 2013 Preview.

Version control (TFVC or Git) Comment on changesets & commits Work item tracking and tagging Team rooms Agile planning tools Feedback Management Agile Portfolio Management* Build* Web-based test case management* Load testing*

New!

New!

New!

New!

Evaluate this session

Scan this QR code to evaluate this session and be automatically entered in a drawing to win a prize!

© 2013 Microsoft Corporation. All rights reserved. Microsoft, Windows, Windows Vista 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.