[Robast-commits] r567 - /

Sat Jan 26 23:40:29 CET 2013

Author: ruckdeschel
Date: 2013-01-26 23:40:29 +0100 (Sat, 26 Jan 2013)
New Revision: 567

Added:
   HOWTO-branch.txt
   missinglogs.txt
Log:
+ added file missinglogs.txt with the commit logs not sent out by mail for later reference
+ added file HOWTO-branch.txt to describe the creation of a new branch, and to do before merging the old devel branch back into trunk


Added: HOWTO-branch.txt
===================================================================

--- HOWTO-branch.txt	                        (rev 0)
+++ HOWTO-branch.txt	2013-01-26 22:40:29 UTC (rev 567)
@@ -0,0 +1,23 @@
+Merging a branch into the trunk (resp. pkg) folder
+
+(1) Preparations:
+
+update the local chechout by svn update 
+
+(2) Note Starting and ending revision number 
+   (e.g. for branch robast-0.9, it is 436 to 5xx)
+   
+(3) make a merge to reintegrate a branch e.g.
+    specify the branch as
+svn+ssh://<r-forge-login>@svn.r-forge.r-project.org/svnroot/robast/branches/robast-0.9/pkg
+    to <head file of your svn checkout>, e.g. C:\rtest\RobASt
+	
+(4) edit conflicts 
+
+(5) create a new branch
+    mark head of trunk (i.e. pkg folder immediately under your checkout head,
+	  ie. eg. C:\rtest\RobASt\pkg)
+    choose branch
+    to path e.g. /branches/robast-1.0/pkg	
+	
+(6) do the same with www ... (destination eg. /branches/robast-1.0/www)
\ No newline at end of file

Added: missinglogs.txt
===================================================================
--- missinglogs.txt	                        (rev 0)
+++ missinglogs.txt	2013-01-26 22:40:29 UTC (rev 567)
@@ -0,0 +1,47 @@
+********************************************
+short:
+********************************************
+------------------------------------------------------------------------
+r526 | ruckdeschel | 2013-01-09 03:00:15 +0100 (Mi, 09 Jan 2013) | 1 line
+------------------------------------------------------------------------
+
+adapted ROptEstOld to the move of Gumbel... from distrEx to RobExtremes
+
+------------------------------------------------------------------------
+r527 | ruckdeschel | 2013-01-09 14:01:17 +0100 (Mi, 09 Jan 2013) | 1 line
+------------------------------------------------------------------------
+
+RobExtremes: inserted Weibull-Family class
+
+------------------------------------------------------------------------
+********************************************
+complete:
+********************************************
+------------------------------------------------------------------------
+r526 | ruckdeschel | 2013-01-09 03:00:15 +0100 (Mi, 09 Jan 2013) | 1 line
+Changed paths:
+   M /branches/robast-0.9/pkg/ROptEstOld/DESCRIPTION
+   M /branches/robast-0.9/pkg/ROptEstOld/NAMESPACE
+   M /branches/robast-0.9/pkg/ROptEstOld/R/AllClass.R
+   M /branches/robast-0.9/pkg/ROptEstOld/R/AllGeneric.R
+   A /branches/robast-0.9/pkg/ROptEstOld/R/AllInitialize.R
+   M /branches/robast-0.9/pkg/ROptEstOld/R/Expectation.R
+   A /branches/robast-0.9/pkg/ROptEstOld/R/Functionals.R
+   A /branches/robast-0.9/pkg/ROptEstOld/R/Gumbel.R
+   A /branches/robast-0.9/pkg/ROptEstOld/R/GumbelLocationFamily.R
+   A /branches/robast-0.9/pkg/ROptEstOld/R/Kurtosis.R
+   A /branches/robast-0.9/pkg/ROptEstOld/R/Skewness.R
+   A /branches/robast-0.9/pkg/ROptEstOld/man/Gumbel-class.Rd
+   A /branches/robast-0.9/pkg/ROptEstOld/man/Gumbel.Rd
+   M /branches/robast-0.9/pkg/ROptEstOld/man/GumbelLocationFamily.Rd
+   A /branches/robast-0.9/pkg/ROptEstOld/man/GumbelParameter-class.Rd
+   A /branches/robast-0.9/pkg/ROptEstOld/man/ROptEstOldConstants.Rd
+
+adapted ROptEstOld to the move of Gumbel... from distrEx to RobExtremes
+------------------------------------------------------------------------
+r527 | ruckdeschel | 2013-01-09 14:01:17 +0100 (Mi, 09 Jan 2013) | 1 line
+Changed paths:
+   M /branches/robast-0.9/pkg/RobExtremes/R/AllClass.R
+
+RobExtremes: inserted Weibull-Family class
+------------------------------------------------------------------------

