Changes between Version 2 and Version 3 of ropp_repository


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

Update branch commit/merge information

Legend:

Unmodified
Added
Removed
Modified

  • ropp_repository

    v2 v3  
    5353
    5454Code developments are then made and logged within a branch as normal.
    55 To view the local changes made to a branch, use the [http://svnbook.red-bean.com/en/1.0/re04.html svn status] command.
     55To view the local changes made to a branch, use the [http://svnbook.red-bean.com/en/1.0/re26.html svn status] command.
    5656
    5757
    … …  
    7070At some stage it may be necessary to update the trunk with latest developments while a user is still working in a particular branch. Users will be notified of any changes to trunk.
    7171
    72 In order to keep a branch up to date with the latest version of the trunk 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 ''svn merge'' command. You must first change directory to your branch's working copy: e.g.
     72In order to keep a branch up to date with the latest version of the trunk 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 [http://svnbook.red-bean.com/en/1.0/re16.html svn merge] command. You must first change directory to your branch's working copy: e.g.
    7373{{{
    74 cd ${HOME}/FCM/<branch name>
     74cd ${HOME}/<SVN_working_dir>/<branch name>
    7575svn merge https://svn.grassaf.org/ropp/ropp_src/trunk
    7676}}}
    … …  
    7979It is useful to preview the files which will be changed on performing a merge before going ahead using:
    8080{{{
    81 cd ${HOME}/FCM/<branch name>
     81cd ${HOME}/<SVN_working_dir>/<branch name>
    8282svn merge --dry-run https://svn.grassaf.org/ropp/ropp_src/trunk
    8383}}}