[Rd] Status of R 2.4.0 in svn repository and R-Admin manual

[Peter Dalgaard]

Gavin Simpson <gavin.simpson at ucl.ac.uk> writes:

> On Wed, 2006-10-04 at 15:03 +0200, Peter Dalgaard wrote:
> > Gavin Simpson <gavin.simpson at ucl.ac.uk> writes:
> > 
> > > Dear list,
> > > 
> > > I have been using and testing the alpha/betas of R 2.4.0, sources for
> > > which I got from svn.r-project.org/R/branches/R-2-4-branch, and which I
> > > compiled on my Fedora Core 5 machine. No problems there. I have just
> > > updated the source tree today and re-compiled - which also works just
> > > fine. When run, this gives:
> > > 
> > > R version 2.4.0 Patched (2006-10-03 r39576)
> > > 
> > > So I assume from that, that I am using the latest version of the R 2.4
> > > branch?
> > > 
> > > This is a little at odds with the R-Admin manual, which in section 1.2.1
> > > states that you get R-patched from
> > > https://svn.r-project.org/R/branches/R-x-y-patches/ . But there is no
> > > R-2-4-patches/ on svn.r-project.org/R/branches/. Is the documentation in
> > > this manual incorrect for R >= 2.4.0, and will
> > > svn.r-project.org/R/branches/R-2-4-branch continue to be R 2.4.0
> > > patched? Or will a R-x-y-branches branch be created for this release?
> > 
> > This is just an oversight.
> > 
> > Thing is that we decided to create the branch already at
> > "Grand-Feature Freeze", which simplifies the release phase procedures
> > quite a bit and reduces the risk of last-minute surprises. It also
> > opens up the "trunk" for new development a bit earlier. So 2.4.x
> > alpha/beta/RC/<final>/Patched releases are now all cut from the same
> > branch. A side effect was that the branch name "x-y-patches" would be
> > a misnomer, so it got changed.
> 
> Hi Peter,
> 
> Thanks for clearing that up for me. If this is the way things are going
> to be done in future, here is a patch to the R-admin.texi sources (also
> attached)
> 
> All the best,
> 
> G
> 
> ## Patch to R-admin.texi - I hope I did this right, first time and all?

Technically, it's fine, but I suspect that more needs to be changed.
I've been trying to work in a new terminology where "r-release-branch"
replaces "r-patched" (for much the same reason as renaming the branch
tag). 

I have this partly in place in 
http://developer.r-project.org/SVNtips.html
but I see that there is still a handful of places that I have missed.  

> Index: doc/manual/R-admin.texi
> ===================================================================
> --- doc/manual/R-admin.texi     (revision 39576)
> +++ doc/manual/R-admin.texi     (working copy)
> @@ -166,7 +166,7 @@
>  @url{http://subversion.tigris.org/, @code{subversion.tigris.org}}), you
>  can check out and update the current r-devel from
>  @url{https://svn.r-project.org/R/trunk/} and the current r-patched from
> - at samp{https://svn.r-project.org/R/branches/R-@var{x}-@var{y}-patches/}
> + at samp{https://svn.r-project.org/R/branches/R-@var{x}-@var{y}-branch/}
>  (where @var{x} and @var{y} are the major and minor number of the current
>  released version of R).  E.g., use
> 
> -- 
> %~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%
>  Gavin Simpson                 [t] +44 (0)20 7679 0522
>  ECRC & ENSIS, UCL Geography,  [f] +44 (0)20 7679 0565
>  Pearson Building,             [e] gavin.simpsonATNOSPAMucl.ac.uk
>  Gower Street, London          [w] http://www.ucl.ac.uk/~ucfagls/
>  UK. WC1E 6BT.                 [w] http://www.freshwaters.org.uk
> %~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%~%
> 

-- 
   O__  ---- Peter Dalgaard             Øster Farimagsgade 5, Entr.B
  c/ /'_ --- Dept. of Biostatistics     PO Box 2099, 1014 Cph. K
 (*) \(*) -- University of Copenhagen   Denmark          Ph:  (+45) 35327918
~~~~~~~~~~ - (p.dalgaard at biostat.ku.dk)                  FAX: (+45) 35327907