Changes between Version 3 and Version 4 of ropp_branches

Show
Ignore:
Timestamp:
10/21/15 13:51:39 (5 years ago)
Author:
frdo
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • ropp_branches

    v3 v4  
    55'''Creating a branch''' 
    66 
    7 To 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: 
     7To 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: 
    88{{{ 
    9 svn copy https://svn.grassaf.org/ropp/ropp_src/trunk https://svn.grassaf.org/ropp/ropp_src/branches/dev/Share/<branch_name> 
     9svn copy https://svn.romsaf.org/ropp/ropp_src/trunk https://svn.romsaf.org/ropp/ropp_src/branches/dev/Share/<branch_name> 
    1010}}} 
    1111where <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. 
     
    1616}}} 
    1717 
    18 Similar branches may be created to store user versions of ropp_doc or ropp_test as required. 
     18Similar branches may be created to store user versions of {{{ropp_doc}}} or {{{ropp_test}}} as required. 
    1919 
    2020'''Checking out a branch''' 
     
    2222To make developments, the branch needs to be checked out to the local working directory for editing as above, specifying the path name for the required branch as 
    2323{{{ 
    24 svn checkout https://svn.grassaf.org/ropp/ropp_src/branches/dev/Share/<branch_name> 
     24svn checkout https://svn.romsaf.org/ropp/ropp_src/branches/dev/Share/<branch_name> ${HOME}/<SVN_working_dir>/<branch name> 
    2525}}} 
    2626 
     
    5151For a branch was created or last updated at revision ''NNNN'', the following command will merge all changes made in trunk since that revision into your branch. 
    5252{{{ 
    53 svn merge -r NNNN:HEAD https://svn.grassaf.org/ropp/ropp_src/trunk 
     53svn merge -r NNNN:HEAD https://svn.romsaf.org/ropp/ropp_src/trunk 
    5454}}} 
    5555When 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). Note that this only results in changes to your working copy so you might want to commit them to the repository.  
     
    5858{{{ 
    5959cd ${HOME}/<SVN_working_dir>/<branch name> 
    60 svn merge --dry-run -r NNNN:HEAD https://svn.grassaf.org/ropp/ropp_src/trunk 
     60svn merge --dry-run -r NNNN:HEAD https://svn.romsaf.org/ropp/ropp_src/trunk 
    6161}}} 
    6262 
     
    6868[http://svnbook.red-bean.com/en/1.0/ch04.html#svn-ch-4-sect-1 SVN reference: Branching and Merging] 
    6969 
    70 [https://trac.grassaf.org/ropp/wiki/ropp_repository Back] 
     70[https://trac.romsaf.org/ropp/wiki/ropp_repository Back]