Changes between Version 1 and Version 2 of gbgp_branches

Timestamp:

2015-10-21T15:11:37Z (9 years ago)

Author:

Dave Offiler

Comment:

--

gbgp_branches

@@ -1 +1 @@
 == Branches ==
 
-Developments to GBGP 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 GBGP. Branches can be temporary and might be for working on resolving a specific Trac Ticket.
+Developments to GBGP should be made from, and committed to, a [http://svnbook.red-bean.com/en/1.7/svn.branchmerge.using.html 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 GBGP. Branches can be temporary and might be for working on resolving a specific Trac Ticket.
 
 '''Creating a branch'''
 
-To create a branch of {{{gbgp_src}}} from the trunk use the [http://svnbook.red-bean.com/en/1.0/re07.html svn copy ''SRC DST''] command:
+To create a branch of {{{gbgp_src}}} from the trunk use the [http://svnbook.red-bean.com/en/1.7/svn.ref.svn.c.copy.html svn copy ''SRC DST''] command:
 {{{
 svn copy https://svn.romsaf.org/gbgp/gbgp_src/trunk https://svn.romsaf.org/gbgp/gbgp_src/branches/dev/Share/<branch_name>
@@ -28 +28 @@
 
 Code developments are then done within a branch as normal.
-To view the local changes made to a branch, use the [http://svnbook.red-bean.com/en/1.0/re26.html svn status] command.
+To view the local changes made to a branch, use the [http://svnbook.red-bean.com/en/1.7/svn.ref.svn.c.status.html svn status] command.
 
 
 '''Committing changes to a branch''' 
 
-When 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.
+When 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.7/svn.ref.svn.c.commit.html svn commit] command.
 {{{
 svn commit -m "Some text here to describe the changes"
@@ -45 +45 @@
 At 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. 
 
-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 [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.
+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 [http://svnbook.red-bean.com/en/1.7/svn.ref.svn.c.merge.html svn merge] command. You must first change directory to your branch's working copy: e.g.
 {{{
 cd ${HOME}/<SVN_working_dir>/<branch name>
@@ -63 +63 @@
 The merge command can be used separately on subdirectories and files within a branch as required.
 
-If a conflict arises between the local copy of a file and the trunk copy to be merged, several versions of that file will be created (e.g. ''file.f90'', ''file.f90.merge-left.rNNNN'', ''file.f90.merge-right.rMMMM''). In general, you will wish to replace the old version of a file (''file.f90.merge-left.rNNNN'') with the latest version from trunk (''file.f90.merge-right.rMMMM''). This can be done manually, and use the [http://svnbook.red-bean.com/en/1.0/re24.html svn resolved] command to indicate that the conflict has been addressed. This will tidy up the files created on merge.
+If a conflict arises between the local copy of a file and the trunk copy to be merged, several versions of that file will be created (e.g. ''file.f90'', ''file.f90.merge-left.rNNNN'', ''file.f90.merge-right.rMMMM''). In general, you will wish to replace the old version of a file (''file.f90.merge-left.rNNNN'') with the latest version from trunk (''file.f90.merge-right.rMMMM''). This can be done manually, and use the 
+[http://svnbook.red-bean.com/en/1.7/svn.ref.svn.c.resolved.html svn resolved] command to indicate that the conflict has been addressed. This will tidy up the files created on merge.
 
 Further information on branches are available in 
-[http://svnbook.red-bean.com/en/1.0/ch04.html#svn-ch-4-sect-1 SVN reference: Branching and Merging]
+[http://svnbook.red-bean.com/en/1.7/svn.branchmerge.using.html SVN reference: Branching and Merging]
 
 [https://trac.romsaf.org/ropp/wiki/gbgp_repository Back]