[Distr-commits] r279 - www

[noreply at r-forge.r-project.org]

Author: ruckdeschel
Date: 2008-08-28 16:21:11 +0200 (Thu, 28 Aug 2008)
New Revision: 279

Modified:
   www/HOWTO-collaborate.txt
Log:
oops included wrong text...

Modified: www/HOWTO-collaborate.txt
===================================================================
--- www/HOWTO-collaborate.txt	2008-08-28 13:45:02 UTC (rev 278)
+++ www/HOWTO-collaborate.txt	2008-08-28 14:21:11 UTC (rev 279)
@@ -40,16 +40,16 @@
     take care to check the corresponding option
 
 %%%%%%%%%%%%%
-(5) join "robkalman" project
+(5) join "distr" project
 %%%%%%%%%%%%%
 
-     go to the "robkalman"-project summary in R-forge and
+     go to the "distr"-project summary in R-forge and
      click option "request to join" so that I can give you corresponding
      file access rights:
 
-     http://r-forge.r-project.org/project/request.php?group_id=88
+     http://r-forge.r-project.org/project/request.php?group_id=87
 
-     after one of the project admin's has accepted your request 
+     after one of the project admins has accepted your request 
      send the public part of your ssh key to r-forge;
 
      to do so follow 3.1.1. 2.) /  3.1.2. 1.) & 2.)
@@ -60,7 +60,7 @@
 %%%%%%%%%%%%%
 
      create some folder locally on your computer where you want to
-     be working on robust-ts ("working copy" of the archived folder)
+     be working on distr ("working copy" of the archived folder)
   
      [under Windows] 
      after installation of TurtoiseSVN easily done with the context
@@ -70,14 +70,14 @@
          your (local) developer folder; 
       + in the field "URL of repository" enter
  
-         svn+ssh://<your username in r-forge>@svn.r-forge.r-project.org/svnroot/robkalman
+         svn+ssh://<your username in r-forge>@svn.r-forge.r-project.org/svnroot/distr
  
      [under Linux]
      + use the command shell;
      + go to your local developing folder;
      + type in
    
-    svn checkout svn+ssh://<your username in r-forge>@svn.r-forge.r-project.org/svnroot/robkalman
+    svn checkout svn+ssh://<your username in r-forge>@svn.r-forge.r-project.org/svnroot/distr
 
     Your local folder now is registered as "Checkout" folder for the archived
     robust-ts- folder  under r-forge.
@@ -102,7 +102,7 @@
      a certain level of consistency within this package
      see
 
-     http://robkalman.r-forge.r-project.org/
+     http://distr.r-forge.r-project.org/
 
 %%%%%%%%%%%%%
 (8) inscribe/ get inscribed into the target list
@@ -119,8 +119,8 @@
 %%%%%%%%%%%%%
 
      under <your checkout-folder>/pkg    and
-     under https://r-forge.r-project.org/plugins/scmsvn/viewcvs.php/pkg/?root=robkalman 
-     you will now find exactly the (sub-)folder structure of the R-package  "robkalman"
+     under https://r-forge.r-project.org/plugins/scmsvn/viewcvs.php/pkg/?root=distr 
+     you will now find exactly the (sub-)folder structure of the R-package  "distr"
      (R, man, inst, data, ....)
 
       any contributions are welcome
@@ -131,3 +131,27 @@
 ------------------------------------------------------------------------
    
 
+%%%%%%%%%%%%%
+(11) not so important to begin with: branches
+%%%%%%%%%%%%%
+
+     as the R-forge repository also is used to provide a source for installation
+     of the devel-versions by non-developers, the "trunc" branch (for operational
+     reasons, in R-forge this is the folder layer immediately below the main
+     distr project folder) should contain installable versions; also this is
+     the only branch for which there is a build service on R-forge. 
+     So the trunc branch should be reserved to (small) patches. 
+     
+     Larger/longer development lines should be done in the
+     versioned branches (e.g. branches/distr-2.0); on demand, we could also 
+     think of developer indidividual branches (e.g. branches/distr-ruckdeschel),
+     but so far we have not seen the need for this. In each of these branches, 
+     there is a complete (cheap) copy of the project tree; here you can also put in 
+     "unready" things.
+    
+     From time to time, and after thorough checking (R CMD check should not find
+     anything!) the devel branches should then be merged into the main trunc again
+     by the svn merge command and a subsequent commit; this should be reserved
+     to project admins, however.
+
+ 
\ No newline at end of file