This shows you the differences between two versions of the page.
| Both sides previous revision Previous revision Next revision | Previous revision | ||
|
sd:subversion [2014/04/15 11:31] filip.jonckers |
sd:subversion [2017/09/11 17:08] (current) ken.andries [Repository access] |
||
|---|---|---|---|
| Line 1: | Line 1: | ||
| - | [[sd:svn-tutorial|Subversion User Tutorial]] | ||
| - | |||
| ====== Subversion ====== | ====== Subversion ====== | ||
| Line 57: | Line 55: | ||
| ===== Basic concepts ===== | ===== Basic concepts ===== | ||
| - | === repository === | + | ==== repository ==== |
| This datastore is the “lock box” where Subversion stores the current and all previous versions of your code | This datastore is the “lock box” where Subversion stores the current and all previous versions of your code | ||
| - | === revision number === | + | ==== revision number ==== |
| Subversion increments the revision number every time code is checked in. It is essentially a unique ID for each transaction. | Subversion increments the revision number every time code is checked in. It is essentially a unique ID for each transaction. | ||
| - | === version number === | + | ==== version number ==== |
| Version numbers are not part of Subversion. They are assigned by programmers according to their understanding of software versioning. | Version numbers are not part of Subversion. They are assigned by programmers according to their understanding of software versioning. | ||
| - | === working copy === | + | ==== working copy ==== |
| The working copy is whatever revision of the code a user has in their directory. This may or may not be in sync with the code in the Subversion repository. | The working copy is whatever revision of the code a user has in their directory. This may or may not be in sync with the code in the Subversion repository. | ||
| - | === trunk === | + | ==== trunk ==== |
| The trunk/ directory in a Subversion repository should contain the latest, greatest, working version of the code and nothing else. | The trunk/ directory in a Subversion repository should contain the latest, greatest, working version of the code and nothing else. | ||
| - | === tags === | + | ==== tags ==== |
| The tags/ directory is for tagging versions of code before embarking on significant code changes. | The tags/ directory is for tagging versions of code before embarking on significant code changes. | ||
| - | === branches === | + | ==== branches ==== |
| The branches/ directory is for those times when you will be making large, potentially damaging changes to the code base. It’s best to keep these separate until completed when they can be merged with the trunk/. | The branches/ directory is for those times when you will be making large, potentially damaging changes to the code base. It’s best to keep these separate until completed when they can be merged with the trunk/. | ||
| Line 79: | Line 77: | ||
| There are different clients to choose from - the two major ones are: | There are different clients to choose from - the two major ones are: | ||
| * [[http://tortoisesvn.tigris.org|TortoiseSVN]] (windows only - explorer integration) | * [[http://tortoisesvn.tigris.org|TortoiseSVN]] (windows only - explorer integration) | ||
| - | * [[http://www.syntevo.com/smartsvn|SmartSVN]] (multi-platform - windows explorer & Mac Finder integration) | + | * [[http://www.smartsvn.com/download|SmartSVN]] (multi-platform - windows explorer & Mac Finder integration) |
| * [[http://www.lachoseinteractive.net/en/community/subversion/svnx/features/|svnX]] (Mac OS X) | * [[http://www.lachoseinteractive.net/en/community/subversion/svnx/features/|svnX]] (Mac OS X) | ||
| A comprehensive list of SVN clients can be found [[http://en.wikipedia.org/wiki/Comparison_of_Subversion_clients|here]] | A comprehensive list of SVN clients can be found [[http://en.wikipedia.org/wiki/Comparison_of_Subversion_clients|here]] | ||
| - | |||
| ==== Which client should I use? ==== | ==== Which client should I use? ==== | ||
| Line 106: | Line 103: | ||
| Well, the answer is simple: not only allows SVN simultaneous working on the same files or group of files but it also manages multiple versions and revision history. It will also allow us to see which team members are just "riding the wagon". | Well, the answer is simple: not only allows SVN simultaneous working on the same files or group of files but it also manages multiple versions and revision history. It will also allow us to see which team members are just "riding the wagon". | ||
| For you as contributor, it allows you to keep track of your revisions, return to a previous version or to check the work from your colleagues. | For you as contributor, it allows you to keep track of your revisions, return to a previous version or to check the work from your colleagues. | ||
| + | |||
| + | |||
| + | ===== Subversion Tutorial ===== | ||
| + | |||
| + | [[sd:svn-tutorial|Continue here to the Subversion tutorial]]. | ||
| + | |||
| + | |||
| + | ---- | ||
| + | |||
| + | [[index:|Back to Index]] | ||