Differences
This shows you the differences between two versions of the page.
Both sides previous revision Previous revision Next revision | Previous revision | ||
systems:subversion_setup_and_configuration [2009/11/20 09:55] smayr |
systems:subversion_setup_and_configuration [2018/01/04 15:56] (current) ajdavis |
||
---|---|---|---|
Line 1: | Line 1: | ||
- | == Subversion Setup and Configuration == | + | == Subversion Setup and Configuration |
This article explains how to perform version control using Subversion (Linux or Windows server) and SVN (Linux client) or TortoiseSVN (Windows client). | This article explains how to perform version control using Subversion (Linux or Windows server) and SVN (Linux client) or TortoiseSVN (Windows client). | ||
Line 21: | Line 21: | ||
$ sudo -u svnuser svnserve -d -T -r /data/repos | $ sudo -u svnuser svnserve -d -T -r /data/repos | ||
$ su -l svnuser -c " | $ su -l svnuser -c " | ||
+ | | ||
+ | Add exception rule to firewall to allow traffice through port 3690 on the subversion server. In Ubuntu: | ||
+ | $ ufw status | ||
+ | $ # Only to 192.168.0.31: | ||
+ | $ ufw allow from 192.168.0.0/ | ||
> ** Note for SELinux / Fedora Core 3+ / Red Hat Enterprise users ** ((Subversion FAQ, http:// | > ** Note for SELinux / Fedora Core 3+ / Red Hat Enterprise users ** ((Subversion FAQ, http:// | ||
Line 194: | Line 199: | ||
exit 1 | exit 1 | ||
</ | </ | ||
- | Make sure the file is owned by svnuser: | + | Make sure the file is owned by '' |
==Subversion under Windows== | ==Subversion under Windows== | ||
Line 257: | Line 262: | ||
====Repository Authentication (Detailed)==== | ====Repository Authentication (Detailed)==== | ||
- | The default svnserve setup provides anonymous read-only access, so whilst you can use the repo-browser in TortoiseSVN to view a repository using an '' | + | The default svnserve setup provides anonymous read-only access, so whilst you can use the repo-browser in TortoiseSVN to view a repository using an '' |
To enable write access to a repository, you need to edit the '' | To enable write access to a repository, you need to edit the '' | ||
Line 305: | Line 310: | ||
====Test Server==== | ====Test Server==== | ||
- | Point browser or SVN client (TortoiseSVN or RapidSVN) to repository. For example: '' | + | Point browser or SVN client (TortoiseSVN or RapidSVN) to repository. For example: '' |
===Checkout a Project (get a Working Copy)=== | ===Checkout a Project (get a Working Copy)=== | ||
Line 332: | Line 337: | ||
</ | </ | ||
Perform previous steps for each repository that needs log editing. | Perform previous steps for each repository that needs log editing. | ||
- | |||
- | |||
=== Setup Branches and Tags === | === Setup Branches and Tags === | ||
* Branches are parallel development copies, to add new features without tampering with the main project trunk. | * Branches are parallel development copies, to add new features without tampering with the main project trunk. | ||
Line 340: | Line 343: | ||
**Create a Branch/ | **Create a Branch/ | ||
- | To create a branch (or tag), simply use the '' | + | To create a branch (or tag), simply use one of the following: |
+ | * In svn use '' | ||
+ | * In TortoiseSVN use Branch/ | ||
+ | * Right-click on project | ||
+ | * TortoiseSVN | ||
+ | * Select | ||
+ | |||
+ | === Synchronizing Branch To Trunk === | ||
+ | * Periodically you merge trunk changes into the branch, so that the branch contains all the trunk changes plus the new feature. The synchronisation process uses Merge a range of revisions. When the feature is complete then you can merge it back to trunk using either Reintegrate a branch or Merge two different trees. | ||
+ | * [[http:// |