Changes between Version 10 and Version 11 of doc/tec/developerrules/svnbranch

Timestamp:

Nov 15, 2018 6:08:59 PM (6 years ago)

Author:

kanani

Comment:

--

doc/tec/developerrules/svnbranch

@@ -4 +4 @@
 
 == (1) Creating an svn branch ==
+'''Repository branch (only for admins)'''
+* @palm server: permissions to be set in /palmdata/conf/svn_authz file
+* {{{svn copy https://palm.muk.uni-hannover.de/svn/palm/trunk https://palm.muk.uni-hannover.de/svn/palm/branches/<feature_name> -m "Branch for <feature_name> created.}}}
+* (rename: {{{svn move <path to old branch> <path to new branch> -m „...“}}})
 
-* Repository branch (only for admins)
-  * @palm server: permissions to be set in /palmdata/conf/svn_authz file
-  * svn copy https://palm.muk.uni-hannover.de/svn/palm/trunk https://palm.muk.uni-hannover.de/svn/palm/branches/<feature_name>\\ -m "Branch for <feature_name> created."
-  * (rename: svn move <path to old branch> <path to new branch> -m „...“)
-
-* Local branch copy (for developers)
-  * Create local working directory where the local copy of branch <feature_name> is placed, we recommend: \\ mkdir -p ~/palm/branches \\ The directory branches is on the same level as the directory current_version, where the official PALM releases/revisions (trunk) should be located
-  * You can browse your branch under https://palm.muk.uni-hannover.de/trac/browser/palm/branches
+'''Local branch copy (for developers)'''
+* Create local working directory where the local copy of branch <feature_name> is placed, we recommend:\\
+  {{{mkdir -p ~/palm/branches}}}\\
+  The directory branches is on the same level as the directory current_version, where the official PALM releases/revisions (trunk) should be located.
+* You can browse your branch repository under https://palm.muk.uni-hannover.de/trac/browser/palm/branches
 
 
@@ -59 +60 @@
 == (4) Synchronizing local branch copy with svn branch or trunk ==
 
-It is wise to '''frequently''' synchronize your local branch copy with the latest svn revision of your branch (see Chap. 4a) and/or  with the trunk (see Chap. 4b)\\ to stay up-to-date. Chap. 4a might become necessary if more than one developer simultaneously work on the same feature branch.
+It is wise to '''frequently''' synchronize your local branch copy with the latest svn revision of your branch (see Chap. 4a) and/or  with the trunk (see Chap. 4b) to stay up-to-date. Chap. 4a might become necessary if more than one developer simultaneously work on the same feature branch.
 
 |||| Please '''DO NOT''' mix up synchronization and other code changes in one commit, because when \\ doing  a diff of two branch revisions it‘s very difficult to find out the actual changes in the branch. ||
@@ -67 +68 @@
 1. {{{cd $HOME/palm/branches/<feature_name>}}} \\
 2. {{{svn update}}} (takes care of merge here)
-3. During update/merge, svn will print an alert in case the same line/block \\ of code has been modified by the different developers. As an example:
-
-   {{{Conflict discovered in file 'palm.f90'.}}} \\
-   {{{Select:}}}  
-   {{{(p) postpone, (df) show diff, (e) edit file, (m) merge, (mc) my side of conflict,}}} \\{{{(tc) their side of conflict, (s) show all options:}}}
+3. During update/merge, svn will print an alert in case the same line/block of code has been modified by the different developers. As an example:
+  {{{
+   Conflict discovered in file 'palm.f90'.
+   Select:  
+   (p) postpone, (df) show diff, (e) edit file, (m) merge, (mc) my side of conflict,
+   (tc) their side of conflict, (s) show all options:
+  }}}
 
    We recommend to {{{select (p)ostpone}}} for all emerging conflicts, and after that, manually check/merge the contents of these files. \\ '''(Details in Chapter 4c)'''