Presentation is loading. Please wait.

Presentation is loading. Please wait.

1 May 25, 2005 Subversion voor Projectleiders Rob Brands Aino Andriessen.

Similar presentations


Presentation on theme: "1 May 25, 2005 Subversion voor Projectleiders Rob Brands Aino Andriessen."— Presentation transcript:

1 1 May 25, 2005 Subversion voor Projectleiders Rob Brands Aino Andriessen

2 2 May 25, 2005 Source control systems MS Visual SourceSafe Subversion (svn) CVS SCCS PVCS ClearCase Bitkeeper Perforce Oracle version control RCS netwerk schijf...

3 3 May 25, 2005 CVS & Subversion CVS wordt traditioneel veel ingezet in de open source community en in Java omgevingen. The goal of the Subversion project is to build a version control system that is a compelling replacement for CVS in the open source community. Subversion wordt in grote communities, als Apache, ingezet.

4 4 May 25, 2005 Approaches lock-modify-unlock  vss copy-modify-merge  svn, cvs

5 5 May 25, 2005 Hele korte Vergelijking SVNMS VS Strategycopy-modify-mergelock-modify-unlock AccessInternet, otherslokaal netwerk ClientsManyVS client OSMS, Linux, MacOS, javaMS Command linexbeperkt Atomic commitsx- Pricinggratisniet gratis Movex? Renamingx? Directory versioning x?

6 6 May 25, 2005 Voordelen Internet access vergelijkbaar met cvs clients copy-modify-merge command line

7 7 May 25, 2005 Aandachtpunten best practices  myproject/branches/  myproject/tags/  myproject/trunk/ copy-modify-merge  bijv. voor projectfiles werkwijze tov vss global revision number  “revision 5 of foo.c”, -> “foo.c as it appears in revision 5.” migratie

8 8 May 25, 2005 Clients Browser command line Windows Explorer (Tortoise) smartSVN IDE's Jira plugin ant / maven...

9 9 May 25, 2005 SVN en Jira Jira kan worden/wordt gekoppeld aan SVN Jira retrieves the svn logfiles Koppeling op basis van het Jira incident nr. Aparte tab bij een incident ! Neem dus het Jira incident nr op als commentaar bij een commit.

10 10 May 25, 2005 Working copy To get a working copy, you must check out some subtree of the repository.  No concept of project or module.svn administrative directories off-line actions Locking is an option

11 11 May 25, 2005 Terminology SourceSafe use the word "checkout" as a command which specifically communicates the intent to edit a file. For CVS / SVN, the "checkout" command is used to retrieve files from the repository regardless of whether the user intends to edit the files or not.

12 12 May 25, 2005 Terminology 2 Repository Check-out Update Commit (check-in) Branch Tag (label) Switch Merge Revision Import Lock working copy...

13 13 May 25, 2005 Revisions Each time the repository accepts a commit, this creates a new state of the filesystem tree, called a revision. Each revision is assigned a unique natural number.  a revision is a “snapshot” of the repository at a particular moment in time  global revision number “revision 5 of foo.c”, -> “foo.c as it appears in revision 5.”  It's important to note that working copies do not always correspond to any single revision in the repository; they may contain files from several different revisions. commit does not pull so you must perform update  shortcuts: HEAD, BASE, PREV,...

14 14 May 25, 2005 Merge Merging is het fundament van svn Op text-files Meestal geen conflicten Built-in conflict resolution Dus ook goede ondersteuning voor het mergen van een branch met de main 'line' Aangeven welke revisies er gemerged moeten worden

15 15 May 25, 2005 Tagging, Branching en Merging Tag = label (in vss) Branch is een aparte kopie Onderliggend mechanisme van taggen en branchen is hetzelfde Smart copy

16 16 May 25, 2005 SVN Architecture

17 17 May 25, 2005 Demo Tortoise Log en revision graph Merging

18 18 May 25, 2005 Resources Wikipedia   Tutorial  Comparison  SVN Crashcourse 

19 19 May 25, 2005 Resources CVS  Subversion    Visual Sourcesafe  Clearcase 


Download ppt "1 May 25, 2005 Subversion voor Projectleiders Rob Brands Aino Andriessen."

Similar presentations


Ads by Google