Skip to content

version stamp details missing on current checkout

4 messages · Vincent Carey, Peter Dalgaard, Martin Maechler

Original
Vincent Carey
# 
this is from a fresh svn checkout:

[stvjc at stvjc1 R-devel]$ ls -tl Makefile
-rw-rw-r--  1 stvjc stvjc 12833 Jun 26 07:24 Makefile
[stvjc at stvjc1 R-devel]$ svn up
At revision 45988.
[stvjc at stvjc1 R-devel]$ bin/R

R version 2.8.0 Under development (unstable) (--)
Copyright (C)  The R Foundation for Statistical Computing
ISBN 3-900051-07-0

..
R version 2.8.0 Under development (unstable) (--)
x86_64-unknown-linux-gnu

locale:
LC_CTYPE=en_US.UTF-8;LC_NUMERIC=C;LC_TIME=en_US.UTF-8;LC_COLLATE=en_US.UTF-8;LC_MONETARY=C;LC_MESSAGES=en_US.UTF-8;LC_PAPER=en_US.UTF-8;LC_NAME=C;LC_ADDRESS=C;LC_TELEPHONE=C;LC_MEASUREMENT=en_US.UTF-8;LC_IDENTIFICATION=C

attached base packages:
[1] stats     graphics  grDevices utils     datasets  methods   base



---
Vince Carey, PhD
Assoc. Prof Med (Biostatistics)
Harvard Medical School
Channing Laboratory - ph 6175252265 fa 6177311541
181 Longwood Ave Boston MA 02115 USA
stvjc at channing.harvard.edu

The information transmitted in this electronic communica...{{dropped:10}}
Peter Dalgaard
#
Vincent Carey 525-2265 wrote:
Works for me... what's in your SVN-REVISION file? Notice that there is 
some slightly weird logic to distinguish whether you are building from 
SVN or from tarballs, based on the existence of $(srcdir)/doc/FAQ and 
$(builddir)/non-tarball. If you have the former and not the latter, it 
is assumed that there will be a ready-made SVN-REVISION.

There's a bug in the Makefile, though:

svnonly:
    @if test ! -f "$(srcdir)/doc/FAQ" || test -f non-tarball ; then \
      (cd doc/manual && $(MAKE) front-matter html-non-svn) ; \
      touch non-tarball ; \
      (cd $(srcdir); LC_ALL=C TZ=GMT svn -rHEAD info || $(ECHO) 
"Revision: unknown") 2> /dev/null \
        | sed -n -e '/^Revision/p' -e '/^Last Changed Date/'p \
        | cut -d' ' -f1,2,3,4 > SVN-REVISION-tmp ; \
...etc...

I don't think we want the -rHEAD there since it can cause the version 
stamp to become different from the version of the source files in case 
of an intervening commit.

  
    

      
      
    

  


  


      

    

    

      
      

        


  

        

      Martin Maechler
    

    

      
      #
    

  


  

          

      
      
      
    

        

        
PD> Vincent Carey 525-2265 wrote:

        
PD> Works for me... what's in your SVN-REVISION file? Notice that there is 
    PD> some slightly weird logic to distinguish whether you are building from 
    PD> SVN or from tarballs, based on the existence of $(srcdir)/doc/FAQ and 
    PD> $(builddir)/non-tarball. If you have the former and not the latter, it 
    PD> is assumed that there will be a ready-made SVN-REVISION.

    PD> There's a bug in the Makefile, though:

    PD> svnonly:
    PD> @if test ! -f "$(srcdir)/doc/FAQ" || test -f non-tarball ; then \
    PD> (cd doc/manual && $(MAKE) front-matter html-non-svn) ; \
    PD> touch non-tarball ; \
    PD> (cd $(srcdir); LC_ALL=C TZ=GMT svn -rHEAD info || $(ECHO) 
    PD> "Revision: unknown") 2> /dev/null \
    PD> | sed -n -e '/^Revision/p' -e '/^Last Changed Date/'p \
    PD> | cut -d' ' -f1,2,3,4 > SVN-REVISION-tmp ; \
    PD> ...etc...

    PD> I don't think we want the -rHEAD there since it can cause the version 
    PD> stamp to become different from the version of the source files in case 
    PD> of an intervening commit.

Hmm, I have added the  -rHEAD   there  about a week ago, 
since there is a bug if it's not there:

SVN-REVISION easily won't be updated correctly, and if you don't
use HEAD : The implicit default seems to be  '-rBASE'
and that can lag behind quite a bit.

It had bitten me so many times that I wanted to see something better.

Martin


    >> this is from a fresh svn checkout:
    >> 
    >> [stvjc at stvjc1 R-devel]$ ls -tl Makefile
    >> -rw-rw-r--  1 stvjc stvjc 12833 Jun 26 07:24 Makefile
    >> [stvjc at stvjc1 R-devel]$ svn up
    >> At revision 45988.
    >> [stvjc at stvjc1 R-devel]$ bin/R
    >> 
    >> R version 2.8.0 Under development (unstable) (--)
    >> Copyright (C)  The R Foundation for Statistical Computing
    >> ISBN 3-900051-07-0
    >> 
    >> ..
    >> 
    >> 
    >>> sessionInfo()
    >>> 
    >> R version 2.8.0 Under development (unstable) (--)
    >> x86_64-unknown-linux-gnu
    >> 
    >> locale:
    >> LC_CTYPE=en_US.UTF-8;LC_NUMERIC=C;LC_TIME=en_US.UTF-8;LC_COLLATE=en_US.UTF-8;LC_MONETARY=C;LC_MESSAGES=en_US.UTF-8;LC_PAPER=en_US.UTF-8;LC_NAME=C;LC_ADDRESS=C;LC_TELEPHONE=C;LC_MEASUREMENT=en_US.UTF-8;LC_IDENTIFICATION=C
    >> 
    >> attached base packages:
    >> [1] stats     graphics  grDevices utils     datasets  methods   base
    >> 
    >> 
    >> 
    >> ---
    >> Vince Carey, PhD
    >> Assoc. Prof Med (Biostatistics)
    >> Harvard Medical School
    >> Channing Laboratory - ph 6175252265 fa 6177311541
    >> 181 Longwood Ave Boston MA 02115 USA
    >> stvjc at channing.harvard.edu
    >> 
    >> The information transmitted in this electronic communica...{{dropped:10}}
    >> 
    >> ______________________________________________
    >> R-devel at r-project.org mailing list
    >> https://stat.ethz.ch/mailman/listinfo/r-devel
    >> 


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

    PD> ______________________________________________
    PD> R-devel at r-project.org mailing list
    PD> https://stat.ethz.ch/mailman/listinfo/r-devel

  
  


  


      

    

    

      
      

        


  

        

      Vincent Carey
    

    

      
      #
    

  


  

      
On Thu, 26 Jun 2008, Peter Dalgaard wrote:

        

            

      
      
      
    

        
[stvjc at stvjc1 R-devel]$ svn up
At revision 45991.
[stvjc at stvjc1 R-devel]$ cat SVN-REV*
Revision: unknown

[stvjc at stvjc1 R-devel]$ ls -tl non-tarball
-rw-rw-r--  1 stvjc stvjc 0 Jun 26 11:07 non-tarball
[stvjc at stvjc1 R-devel]$ ls -tl doc/FAQ
-rw-rw-r--  1 stvjc stvjc 271978 Jun 26 07:24 doc/FAQ

the sessionInfo() gives the same data as before.

            

      
      
      
    

        

      
      
    

            

      
      
      
    

        
-------------- next part --------------

The information transmitted in this electronic communica...{{dropped:18}}