Versioning systems tutorial - with SVN

Samuel Colin

Description

Introduction to VSes Using SVNVersioning systems tutorialwith SVN1Samuel ColinLORIA – Université Nancy 2Campus Scientifique, BP 2391F 54506 Vandœuvre lès Nancy cedexEmail: {firstname.lastname}@loria.frLORIA/DEDALEIntroduction to VSes Using SVNOutline1 Introduction to VSesA bit of historyTypical work with a VSClosing words about VSes2 Using SVNA typical work with SVNTutorialIntroduction to VSes Using SVNHistoryGNU ArchGitBazaar( ng)Distributed MercurialDarcsSVK... Fed upCVS...CVS(NT)Centralized Subversion...Introduction to VSes Using SVNWhat does a VS do ?Keeps track of modifications: who, what, when, how ?Givesawayforseveraldeveloperstointerveneonasameprojectat the same timeGives tools for solving contradicting modifications (conflicts)Identifies interestings versions of the projectEases more thorough changes of the project (branching)...... and the reuniting with the official version of the project(merging)Introduction to VSes Using SVNThe typical workflowCheckout of the repository (I want to contribute)Loop:Update (what did others change ?)ModifyUpdate + conflicts resolutionCommit (I validate my changes)Repeat LoopIntroduction to VSes Using SVNReferenceshttp://en.wikipedia.org/wiki/Comparison_of_revision_control_softwareIntroduction to VSes Using SVNA few last wordsA versioning system is not a backup systemA v system does not replace communicationA best practice is to leave the central repository in a ...

Informations

• Publié par: Urne
• Nombre de lectures: 32
• Langue: English

Extrait

IntroductiontoVSes

Versioning systems tutorial

1

with SVN

Samuel Colin 1

LORIA – Université Nancy 2 Campus Scientifique, BP 239 F-54506 Vandœuvre-lès-Nancy cedex Email: {firstname.lastname}@loria.fr

LORIA/DEDALE

UsingVSN

nIrtdocuito

1

2

notSVse

Outline

Introduction to VSes A bit of history Typical work with a VS Closing words about VSes

Using SVN A typical work with SVN Tutorial

UsingSVN

nIrtoductiontoVSe

CVS

s

. . .

Fed up

History

Distributed

Centralized

GNU Arch

Git

Bazaar(-ng)

Mercurial

Darcs

SVK . . .

CVS(NT)

Subversion . . .

UsingVSN

IntroductionotVSes

What does a VS do ?

Usi

Keeps track of modifications: who, what, when, how ? Gives a way for several developers to intervene on a same project at the same time Gives tools for solving contradicting modifications (conflicts) Identifies interestings versions of the project Eases more thorough changes of the project (branching)... ... and the reuniting with the official version of the project (merging)

ngSVN

nItroductiontoVSes

The typical workflow

Checkout of the repository(I want to contribute) Loop: Update(what did others change ?) Modify Update + conflicts resolution Commit(I validate my changes) Repeat Loop

UsingVSN

Introduction to VSes

References

http://en.wikipedia.org/wiki/Comparison_of_ _ _ revision control software

Using SVN

IntroductionotVSes

A few last words

A versioning system isnota backup system

A versioning system does not replace communication

A best practice is to leave the central repository in a compilable state

UsingVSN

Introductio

1

2

notSVse

Outline

Introduction to VSes A bit of history Typical work with a VS Closing words about VSes

Using SVN A typical work with SVN Tutorial

sUnigVSN

ofdrtesdna

svn help

svn checkout protocol://directory local-directory cd local-directory svn update Modify. Can be: svn add some-file svn remove file svn move file1 file2 svn copy some-file Modify files svn update (there might be conflicts, see later) svn commit Repeat

The typical workflow: the actual commands

lsaiouabhettmmco NVSgnisUseSVontioctdurontI

nIrtdocutiontoSVes

The typical workflow: cases of conflicts

On an update: It will look like this C test.txt Actualisé à la révision 2.

On a commit: Subversion complains

Envoi test.txt Transmission des données .svn: Échec de la propagation (commit), détails : svn: Le chemin ’test.txt’ est obsolète dans la transaction ’3-1’

Solution: do an update

We shall next see how to resolve a conflict.

UsingSVN

IntroductiontoV

svn

? ? ? C

Ses

status

elvaseuswi

test.txt.r2 test.txt.mine test.txt.r1 test.txt

t

Conflicts:

what has happened ?

h: sUnigSVN