Changes between Version 1 and Version 2 of ropp_repository


Ignore:
Timestamp:
2008-03-13T10:07:17Z (16 years ago)
Author:
Huw Lewis
Comment:

Check instructions are ok for creating/checking out branch

Legend:

Unmodified
Added
Removed
Modified
  • ropp_repository

    v1 v2  
    1010https://svn.grassaf.org/ropp/
    1111}}}
    12 For example, checking out the latest development (trunk) versions:
     12
     13For a complete list of Subversion commands see the [http://svnbook.red-bean.com/en/1.0/index.html SVN reference manual]
     14
     15'''Checking out trunk'''
     16
     17To [http://svnbook.red-bean.com/en/1.0/re04.html checkout] the latest development (trunk) versions:
    1318{{{
    1419svn checkout https://svn.grassaf.org/ropp/ropp_src/trunk .
     
    1621svn checkout https://svn.grassaf.org/ropp/ropp_test/trunk .
    1722}}}
    18 will check out the source code, documentation, and test folder, respectively to the local working directory.
     23This will check out the source code, documentation, and test folder, respectively to the local working directory.
    1924
    20 For a complete list of Subversion commands see the [http://svnbook.red-bean.com/en/1.0/index.html SVN reference manual]
    2125
    2226== Branches ==
    2327
    24 Developments to ROPP should be 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.
     28Developments to ROPP should be made from, and committed to, a [http://svnbook.red-bean.com/en/1.0/ch04.html#svn-ch-4-sect-1 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.
    2529
    2630'''Creating a branch'''
    2731
    28 To create a branch of ropp_src from the trunk use the ''svn copy SRC DST'' command:
     32To create a branch of ropp_src from the trunk use the [http://svnbook.red-bean.com/en/1.0/re07.html svn copy ''SRC DST''] command:
    2933{{{
    3034svn copy https://svn.grassaf.org/ropp/ropp_src/trunk https://svn.grassaf.org/ropp/ropp_src/branches/dev/Share/<branch_name>
    3135}}}
    32 where <branch name> is a name of your choice which should reflect what you are working on.
     36where <branch name> is a name of your choice which should reflect what you are working on. This prompts a text editor where you should describe the purpose of the new branch.
    3337
    34 By default it is assumed that you wish to branch from the latest change version of the trunk. The ''-r'' flag can be used to specify the trunk revision from which a branch is required if this is not the latest. The ''-m'' flag should be used when creating a branch to describe the contents of the branch.
     38By default it is assumed that you wish to branch from the latest change version of the trunk. The ''-r'' flag can be used to specify the trunk revision from which a branch is required if this is not the latest. The ''-m'' flag could also be used when creating a branch to describe the contents of the branch.
    3539{{{
    3640svn copy [-r revision] SRC DST [-m "some text here"]
     
    4953
    5054Code developments are then made and logged within a branch as normal.
    51 To view the local changes made to a branch, use the ''svn status'' command
     55To view the local changes made to a branch, use the [http://svnbook.red-bean.com/en/1.0/re04.html svn status] command.
    5256
    5357
    5458'''Committing changes to a branch'''
    5559
    56 When changes to a branch are ready to be updated in the repository, the code needs to be committed.
     60When changes to a branch are ready to be updated in the repository, the code needs to be committed using the [http://svnbook.red-bean.com/en/1.0/re05.html svn commit] command.
    5761{{{
    5862svn commit -m "Some text here to describe the changes"