| 35 | | == Branches == |
| 36 | | |
| 37 | | It is recommended that developments to ROPP are made from, and committed to, a ''branch'' rather than directly to the latest trunk version. This allows changes to be tested before merging the required changes back into the trunk. The trunk therefore represents a stable 'next potential release' state for ROPP. Branches can be temporary and might be for working on resolving a specific Trac Ticket. |
| 38 | | |
| 39 | | To create a branch of ropp_src from the trunk use the command: |
| 40 | | {{{ |
| 41 | | fcm branch -c -n <branch name> -t DEV::SHARE --rev-flag NORMAL --branch-of-branch fcm:ropp_src_tr |
| 42 | | }}} |
| 43 | | where <branch name> is a name of your choice which should reflect what you are working on. |
| 44 | | To create a branch for sole use by the user, specify -t DEV::USER in the branch command. Similar branches can be created to store user versions of ropp_doc, ropp_test and ropp_web as required. |
| 45 | | |
| 46 | | To make developments, the branch needs to be checked out as above, specifying the path name for the required branch as |
| 47 | | {{{ |
| 48 | | fcm co fcm:ropp_src/branches/dev/Share/<branch name> |
| 49 | | }}} |
| 50 | | or |
| 51 | | {{{ |
| 52 | | fcm co fcm:ropp_src/branches/dev/<user id>/<branch name> |
| 53 | | }}} |
| 54 | | if using a private user branch. |
| 55 | | |
| 56 | | When all the changes you require to your branch have been committed and the ROPP Development Team are satisfied that it will be part of the next release, these changes will be merged back into the trunk by using merge. To do this, you must first change directory to your working copy of the trunk (create one using checkout if you don't already have it). Then enter the following: |
| 57 | | {{{ |
| 58 | | cd ${HOME}/FCM/ropp_src |
| 59 | | fcm merge fcm:ropp_src/branches/dev/Share/<branch name> |
| 60 | | }}} |
| 61 | | After the merge, you will get a list of changes and your working copy of the main trunk will be updated. Nothing will change in the repository until you commit your working copy of the main trunk back into the repository. If everything has gone smoothly, you should delete your branch by using the following commands: |
| 62 | | {{{ |
| 63 | | cd ${HOME}/FCM/<branch name> |
| 64 | | fcm branch --delete |
| 65 | | }}} |
| 66 | | |
| 67 | | While you are working on your branch, you may want to bring in the changes that have been made to the main trunk. This can be done using the merge command. You must first change directory to your branch's working copy: |
| 68 | | {{{ |
| 69 | | cd ${HOME}/FCM/<branch name> |
| 70 | | fcm merge fcm:ropp_src_tr |
| 71 | | }}} |
| 72 | | When you do this, you should see the list of updates that have been made to the trunk since you last brought in any changes (or since you branched). Again, this only results in changes to your working copy so you might want to commit them. |
| | 30 | For instructions on how to access the ROPP repository (authorised users only) |
| | 31 | see the [https://trac.grassaf.org/ropp/wiki/ropp_repository instructions for developers]. |
