Version Control Systems and the Subversion Kloimstein Dominik

Overview Basic information about VCS/Subversion Standard commands of Subversion Branching and Merging

What is a Version Control System? Software xyz Version Standard software update process In general version is deleted – use

What is a Version Control System? Same update process with arbitrary files Also first textfile will be overriden Textfile x Last change: Textfile x Last change:

What is a Version Control System? Textfile x Last change: Textfile x Last change: User A

What is a Version Control System? Manages all versions of files or directories in the system Subversion is a open source VCS

What are Revisions? Are like version numbers of files or directories Each change of a file increases the revision number by 1 Subversion gives the whole filesystem a number Such a filesystem tree is called repository

What are Revisions?

File sharing problem

Lock-modify-unlock solution

File sharing problem Problems are: – Administration (enough rights to lock) – Performance (one user must wait) – False sense of security Harry works on File A Sally works on File B A and B are depend on each other

File sharing problem Copy-modify-merge solution

File sharing problem Copy-modify-merge solution

File sharing problem Subversion use the copy-modify-merge method No waiting Problem of so called conflicts – Same problem with different results – Overlaping of changes – Solution: Communication (direct talk or put a flag) Subversion can also lock files – Necessary for sound or graphic files

Repository

How to work with Subversion svn [command] [URL] – $ svn checkout URL-forms: – file:/// - direct local access – - access to a Apache server – - same as http with SSL encryption – svn:// -access to a Subversion server – svn+ssh:// - same as svn through SSH tunnel

How to work with Subversion file:///C:/svn/repos file:///svn/repos file:///localhost/svn/repos

Commands The most often used commands are: – svn add URL – svn delete URL – svn copy URL1 URL2 – svn move URL1 URL2 – svn mkdir URL

Commands checkout – copy files to the local working directory $ svn checkout A calc/Makefile A calc/integer.c A calc/button.c Checked out revision 1.

Commands commit – submit one or several files to the server $ svn commit button.c Sending button.c Transmitting file data. Committed revision 57. Command commit maybe don‘t change files – solution command update

Commands update – submit the whole working directory to the server $ svn update Updating '.': U button.c Updated to revision 58.

Commands import – import a file or directory to the repository $ svn import /path/to/mytree \ Adding mytree/foo.c Adding mytree/bar.c Adding mytree/subdir Adding mytree/subdir/quux.h Committed revision 59.

Commands list – show files in the given directory $ svn list bar.c foo.c subdir/

Commands status – show a overview of all changes – ? item – This item is not under version control – A item – Scheduled for addition to the repository – D item – Scheduled for deleting this item in the repository – M item – The content in item is modified $ svn status ? scratch.c A stuff/loot A stuff/loot/new.c D stuff/old.c M bar.c

Commands $ svn status stuff/fish.c D stuff/fish.c $ svn status -v M sally README sally INSTALL M harry bar.c ira stuff harry stuff/trout.c D ira stuff/fish.c sally stuff/things A 0 ? ? stuff/things/bloo.h harry stuff/things/gloo.c

Commands diff – show a overview of all changes in detail $ svn diff Index: bar.c =================================================================== --- bar.c (revision 3) +++ bar.c (working copy) +#include + +#include int main(void) { - printf("Sixty-four slices of American Cheese...\n"); + printf("Sixty-five slices of American Cheese...\n"); return 0; } Index: README...

Commands log – show a time based overview of all changes in detail $ svn log r3 | sally | :09: (Thu, 15 May 2008) | 1 line Added include lines and corrected # of cheese slices r2 | harry | :43: (Wed, 14 May 2008) | 1 line Added main() methods r1 | sally | :50: (Sat, 10 May 2008) | 1 line Initial import

Commands $ svn log -r 8 -v r8 | sally | :19: (Wed, 21 May 2008) | 1 line Changed paths: M /trunk/code/foo.c M /trunk/code/bar.h A /trunk/code/doc/README Frozzled the sub-space winch

Commands cat – return the content of a file $ cat sandwich.txt Top piece of bread Salami Mortadella Prosciutto

Commands revert – delete changes and start from the beginning $ cat sandwich.txt Top piece of bread Salami Mortadella Prosciutto Now change Salami to Salad. $ cat sandwich.txt Top piece of bread Salad Mortadella Prosciutto $ svn revert sandwich.txt Reverted 'sandwich.txt‘ $ cat sandwich.txt Top piece of bread Salami Mortadella Prosciutto

Commands $ svn cat -r 2 sandwich.txt Top piece of bread Salad Mortadella Prosciutto

Branching and Merging Trunc – is the main directory Branch – is a copy of a file or directory of the trunc section with small differences Tag – is a kind of „snapshot“ of a revision Merge – is the combining of two branches (or to combine the branch back with the trunc)

Branching and Merging

Tag – example $ svn copy \ \ Committed revision 902.

Branching and Merging Merge – example $ svn merge --reintegrate ^/calc/branches/my-calc-branch --- Merging differences between repository URLs into '.': U button.c U integer.c U Makefile --- Recording mergeinfo for merge between repository URLs into '.': U. $ svn commit -m "Merge my-calc-branch back into trunk!" Sending. Sending button.c Sending integer.c Sending Makefile Transmitting file data.. Committed revision 391.

Branching and Merging # Which changes have already been merged from trunk to branch? $ svn mergeinfo ^/calc/trunk r341 r342 r343 … r388 r389 r390 # Which changes are still eligible to merge from trunk to branch? $ svn mergeinfo ^/calc/trunk --show-revs eligible r391 r392 r393 r394 r395 $