| 45 | | == openvpn-testing == |
| 46 | | |
| 47 | | This repository is not used very much, although openvpn-testing.git "master" is kept in sync with openvpn.git "master". There are several branches in the openvpn-testing git tree, each of which tracks the different patches/contributions separately. The branch structure is: |
| 48 | | |
| 49 | | {{{ |
| 50 | | master -- This should be identical to the openvpn.git master branch |
| 51 | | svn-branch/BETA21 -- This should be identical to James' former SVN BETA21 branch (former svn-BETA21). This branch is inactive. |
| 52 | | svn-branch/2.1 -- This is a git copy of James' 2.1 SVN branch, where James does his main work. This gets merged into master. |
| 53 | | release/2.1 -- This contains only the source relevant for the 2.1 releases. (former released-2.1) |
| 54 | | release/2.2 -- This contains only the source relevant for the 2.2 releases. (former beta2.2) |
| 55 | | obsolete/* -- Obsolete branches. |
| 56 | | {featureX} -- Contains only patches for feature X |
| 57 | | {featureY} -- Contains only patches for feature Y |
| 58 | | {featureZ} -- Contains only patches for feature Z |
| 59 | | frp -- Features which are going through the feature removal process (FRP). |
| 60 | | experimental -- The master branch merged with other experimental feature branches. Only for test purpose and not development. |
| 61 | | }}} |
| 62 | | |
| 63 | | Developers being granted a feature branch must ensure that their branch is regularly [http://www.kernel.org/pub/software/scm/git/docs/git-rebase.html rebased] against the master branch. The same applies to maintainers of external development git trees who wants to see their work getting accepted too. The developers "owning" a feature branch is responsible for all development in that branch. |
| 64 | | |
| 65 | | The branches gathered under obsolete/* are misc branches which is no longer in use. As some of them might have a historical value, they are just put aside. This may happen to branches which have been merged into master and are now developed on the master branch instead. Eventually they will be deleted when their historical purpose is no longer of any value. |
| 66 | | |
| 67 | | The experimental branch is a collection of all feature branches in development and the master branch. This branch is regularly rebased against the master branch. This branch may also be completely rebuilt from time to time. Consider this branch as a ''view-and-test-only'' branch. No development must ever happen directly on the experimental branch. |
| 68 | | |
| 69 | | To fetch the latest openvpn-testing tree, use |
| 70 | | |
| 71 | | {{{ |
| 72 | | git clone git://openvpn.git.sourceforge.net/gitroot/openvpn/openvpn-testing.git |
| 73 | | }}} |
| 74 | | |
| 75 | | You will here get a openvpn-testing directory. When entering this directory, you will get the 'master' branch by default. To checkout the experimental branch, use |
| 76 | | |
| 77 | | {{{ |
| 78 | | git checkout -b experimental origin/experimental |
| 79 | | }}} |
| 80 | | |
| 81 | | |
| 82 | | To see all available branches, use |
| 83 | | |
| 84 | | {{{ |
| 85 | | git branch -a |
| 86 | | }}} |
| 87 | | |
| 88 | | Use the code in the experimental branch from this git tree if you want the "latest and greatest" features and you're willing to accept that the code is experimental and most likely unstable. |
| 89 | | |
