source code management tools
TRANSCRIPT
Source Code ManagementTools
Clement Delafargue
Ecole Centrale de Nantes – EklaWeb
March 4, 2010
Your workflows
The MELOG TA - How did you manage to share your work ?
I Mail ?
I USB stick ?
Your workflows
How would have you done
I with a single file edited by everybody at the same time ?
I if you’d wanted to discard some changes ?
What a SCM system is
I A history of your files
I A way to share files within a team
What a SCM system is NOT
A replacement to communication
Source Code Management Tools
Basic notions
Centralized / Decentralized
How can SCM help you ?
Basic notions
Repository
I Contains the history
I Not directly usable
Basic notions
Working copy
I Files you can work on
I An image of the repository at a certain time
Basic notions
Commit
I The act of sending your local modifications to a repository
I Sould be atomic
Basic notions
Branch
I A Parallel version
Basic notions
Trunk
I The main branch
Basic notions
Conflict resolution
I When magic is not enough
Source Code Management Tools
Basic notions
Centralized / Decentralized
How can SCM help you ?
Centralized SCM
Centralized SCM is Centralized
I Only ONE (remote) repository
Introducing Subversion
Decentralized SCM
Everybody has his own repo
I Every one has his own branch
I Eventual consistency
I Network of trust
When centralized is not enough
Who wants to break the trunk ?
I Committing without sharing... yet
When centralized is not enough
Local repository is local
I Do almost anything... even if you’re offline
When centralized is not enough
Branching and merging is cheap
I If a task is to last for one day or more...
I make it a branch
Introducing Git
Source Code Management Tools
Basic notions
Centralized / Decentralized
How can SCM help you ?
How can SCM help you ?
Your workflows... evolved
Copyright notice – CC-By-SA 2.0
You are free
I to Share: to copy, distribute and transmit the work
I to Remix: to adapt the work
Under the following conditions
I Attribution: You must attribute the work in the mannerspecified by the author or licensor (but not in any way thatsuggests that they endorse you or your use of the work).
I Share Alike: If you alter, transform, or build upon this work,you may distribute the resulting work only under the same orsimilar license to this one.