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 [2010/03/22 15:46] 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 338: | 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 === | === 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. | * 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:// | ||