Changes between Version 1 and Version 2 of doc/tec/developerrules/svnbranch

Timestamp:

Nov 12, 2018 11:04:14 AM (6 years ago)

Author:

westbrink

Comment:

--

doc/tec/developerrules/svnbranch

@@ -3 +3 @@
 == (1) Creating an svn branch ==
 
-* abc
-  * def
+* 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 „...“)
 
-{{{abc}}}
+* 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
+
+== (2 a) Checkout of local branch copy ==
+
+* {{{cd $HOME/palm/branches/ }}}
+* {{{ svn checkout --username <your PALM username> https://palm.muk.uni-hannover.de/svn/palm/branches/<feature_name>}}}
+
+== (2 b) Update of local branch copy ==
+
+If the local branch copy already exists, and you would like to update it with a newer svn revision of this branch:
+
+* {{{cd $HOME/palm/branches/}}}
+* {{{svn update <feature_name>}}} 
+
+You can also update/downdate to or checkout a specific revision:
+
+* {{{svn update -r<revision number> <feature_name>}}}
+* {{{svn checkout -r<revision number> --username ... }}}
+
+== (3) Code development in local ... ==
+
+* __...'''svn''' branch copy__ \\ Versioning happens when commiting to the svn repository branch. With every commit, the PALM revision number is incremented.
+* __...'''git''' branch copy__ \\ To avoid too numerous commits to the svn repository branch, local versioning could be done using git (→ follow steps on next slide) 
+
+__'''NOTE'''__: As you know, in order to compile and run PALM, the PATH and PALM_BIN variables need to be set in your shell environment (e.g. .profile or .bashrc) as in this example:
+
+
+
+