SVN Workshop Basics Conflicts Branching Merging Release Management Best Practices

SVN workshop By Tim de Pater / @trafex

Index ,[object Object],[object Object],[object Object],[object Object],[object Object],[object Object]

Basics ,[object Object],$ svn checkout http://repos.enrise.com/svn/project/branches/release-2.1 projectfolder A projectfolder/files Checked out revision 14.

Basics ,[object Object],Path: . URL: http://repos.enrise.com/svn/4106-Nederlands%20dagblad/trunk Repository Root: http://repos.enrise.com/svn Repository UUID: 317ccd4c-6b34-0410-924f-f0004c2b7d44 Revision: 12664 Node Kind: directory Schedule: normal Last Changed Author: tpater Last Changed Rev: 12664 Last Changed Date: 2011-03-11 11:25:13 +0100 (Fri, 11 Mar 2011)

Basics ,[object Object], '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 ,[object Object],$ svn up U grocerylist.txt Updated to revision 14.

Basics ,[object Object],$ svn add index.php A index.php

Basics ,[object Object],$ svn commit -m 'Commit melding' Sending src/templates/admin/newspapermanagement.php Transmitting file data . Committed revision 12854.

Basics ,[object Object],$ svn revert public/index.php Reverted 'public/index.php'

Basics ,[object Object],[object Object],[object Object],[object Object],[object Object],svn help <command>

Conflicts ,[object Object],$ svn up Conflict discovered in 'grocery.txt'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options:

Conflicts ,[object Object],Milk <<<<<<< .mine Hot Dog ======= Cheese >>>>>>> .r12 Juice Milk Hot Dog Juice svn up

Resolving conflicts - option 1 ,[object Object],$ svn revert grocery.txt Reverted 'grocery.txt'

Resolving conflicts - option 2 ,[object Object],[object Object],[object Object],[object Object],[object Object],$ cp grocery.txt .mine grocery.txt $ svn resolved grocery.txt Resolved conflicted state of 'grocery.txt'edition

Resolving conflicts - option 3 ,[object Object],[object Object],Milk <<<<<<< .mine Hot Dog ======= Cheese >>>>>>> .r12 Juice Milk Hot Dog Cheese Juice $ svn resolved grocery.txt

Conflict your neighbour ,[object Object],[object Object],[object Object]

Branching ,[object Object],$ 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.

Branching ,[object Object],$ svn sw http://svnworkshop.enrise.com/svn/TestProject/branches/feat-guestbook At revision 13.

Merging ,[object Object],[object Object],[object Object],[object Object],[object Object]

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 lines Implemented 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 ,[object Object],[object Object],[object Object],[object Object]

Release management ,[object Object],[object Object],[object Object],[object Object]

Best practice ,[object Object],[object Object],[object Object],[object Object],[object Object]

URL's ,[object Object],[object Object],[object Object]

SVN Workshop Basics Conflicts Branching Merging Release Management Best Practices

Recomendados

Recomendados

Más contenido relacionado

La actualidad más candente

La actualidad más candente (20)

Similar a SVN Workshop Basics Conflicts Branching Merging Release Management Best Practices

Similar a SVN Workshop Basics Conflicts Branching Merging Release Management Best Practices (20)

Último

Último (20)

SVN Workshop Basics Conflicts Branching Merging Release Management Best Practices

Notas del editor