View
797
Download
0
Category
Preview:
DESCRIPTION
A dutch presentation about the basics of subversion on the commandline.
Citation preview
SVN workshop
By Tim de Pater / @trafex
Index
• Basics• Conflicts• Branching• Merging• Release management • Best practice
Basics
svn checkout
$ svn checkout http://repos.enrise.com/svn/project/branches/release-2.1 projectfolder A projectfolder/filesChecked out revision 14.
Basics
svn info
Path: .URL: http://repos.enrise.com/svn/4106-Nederlands%20dagblad/trunkRepository Root: http://repos.enrise.com/svnRepository UUID: 317ccd4c-6b34-0410-924f-f0004c2b7d44Revision: 12664Node Kind: directorySchedule: normalLast Changed Author: tpaterLast Changed Rev: 12664Last Changed Date: 2011-03-11 11:25:13 +0100 (Fri, 11 Mar 2011)
Basics
svn status 'A' Added 'C' Conflicted 'D' Deleted 'I' Ignored 'M' Modified 'R' Replaced 'X' an unversioned directory created by an externals definition '?' item is not under version control '!' item is missing (removed by non-svn command) or incomplete '~' versioned item obstructed by some item of a different kind
Basics
svn update
$ svn upU grocerylist.txtUpdated to revision 14.
Basics
svn add
$ svn add index.php A index.php
Basics
svn commit
$ svn commit -m 'Commit melding' Sending src/templates/admin/newspapermanagement.phpTransmitting file data .Committed revision 12854.
Basics
svn revert
$ svn revert public/index.php Reverted 'public/index.php'
Basics
svn mvsvn rmsvn cp
svn mkdirsvn ls
svn help <command>
Conflicts
$ svn upConflict discovered in 'grocery.txt'.Select: (p) postpone, (df) diff-full,(e) edit, (mc) mine-conflict,(tc) theirs-conflict, (s) show all options:
Conflicts
Ontstaan doordat 2 mensen dezelfde regel bewerken
Conflicts
grocery.txt
Milk<<<<<<< .mineHot Dog=======Cheese>>>>>>> .r12Juice
MilkHot DogJuice
svn up
Resolving conflicts - option 1
Versie van collega accepteren
$ svn revert grocery.txtReverted 'grocery.txt'
Resolving conflicts - option 2
Eigen versie behouden• grocery.txt – orgineel met markeringen• grocery.txt.mine – eigen versie• grocery.txt.r5 – orgineel die je bewerkt hebt• grocery.txt.r6 – nieuwste versie die je collega bewerkt heeft
$ cp grocery.txt.mine grocery.txt$ svn resolved grocery.txt Resolved conflicted state of 'grocery.txt'edition
Resolving conflicts - option 3
Handmatig mergen
Conflict oplossen optie 2Milk<<<<<<< .mineHot Dog=======Cheese>>>>>>> .r12Juice
MilkHot DogCheeseJuice
$ svn resolved grocery.txt
Conflict your neighbour
• Checkout http://svnworkshop.enrise.com/svn/TestProject/trunk
• Zorg dat je een conflict krijgt met je buurman • Los het conflict handmatig op
Branching
Branching
$ svn cp http://svnworkshop.enrise.com/svn/TestProject/trunk \http://svnworkshop.enrise.com/svn/TestProject/branches/feat-guestbook \-m 'Created branch to implement guestbook feature' Committed revision 13.
svn cp
Branching
$ svn sw http://svnworkshop.enrise.com/svn/TestProject/branches/feat-guestbook At revision 13.
svn switch
Branch pattern
Merging
We willen feat-digitaledition mergen met release-2.1 branch.1.Vind het revisie nummer waarin de feature branch
is aangemaakt• Vind het revisie nummer van de laatste wijziging
in de feature branch• Voer de merge uit• Commit
Merging
Vind het revisie nummer waarin de rfc branch is aangemaakt
$ svn log --stop-on-copy http://svnworkshop.enrise.com/svn/TestProject/feat-digitaledition<...scroll down...> -------------------------------------------------------r13 | tpater | 2011-03-28 12:20:38 +0200 (Mon, 28 Mar 2011) | 1 line
Created branch to implement digitaledition-------------------------------------------------------$
Merging
Vind het revisie nummer van de laatste wijziging in de rfc branch
$ svn log -l 1 http://svnworkshop.enrise.com/svn/TestProject/feat-digitaledition-----------------------------------------------------r15 | tpater | 2011-03-28 16:55:53 +0200 (Mon, 28 Mar 2011) | 2 linesImplemented crap
Merging
svn merge
$ svn merge -r 13:15 http://svnworkshop.enrise.com/svn/TestProject/branches/feat-digitaledition--- Merging r14 through r15 into '.':A test.txt
$ svn ci -m 'Merged with feat-digitaledition'Sending .Adding test.txt
Committed revision 16.
Merging your ass off
• Mergeo NederlandsDagbladXX/branches/release-2.1o NederlandsDagbladXX/branches/feat-digitaledition
• Repo: http://svnworkshop.enrise.com/svn
Release management
• Mantis• Deploy • Versie's• Changelogs
Best practice
1. Committen doe je per rfc/bugfix/wijziging 2. Zorg dat het aantal wijzigingen per commit klein blijven 3. Commit alleen werkende code4. Geef in je commentaar aan WAAROM je een bepaalde wijziging
hebt doorgevoerd.5. Geef in het commentaar niet aan om welke bestanden het gaat,
deze gegevens zijn beschikbaar.
• http://wiki.4worx.com/index.php/Svn_guidelines• http://www.slideshare.net/lornajane/practical-php-for-svn-
developers• http://www.makebetterthings.com/blogs/php/introduction-to-
version-control-system/
URL's
Vragen?
Recommended