diff options
author | edwin <edwin@FreeBSD.org> | 2008-08-08 04:37:43 +0000 |
---|---|---|
committer | edwin <edwin@FreeBSD.org> | 2008-08-08 04:37:43 +0000 |
commit | bae566e829037425feb67b04dda3a1f5ecbeb933 (patch) | |
tree | d62222f1e12ef32e16b69adf7ef66a2373ed6593 | |
parent | 91391900307bfef0594edf5a6fed29f68a657f0f (diff) | |
download | FreeBSD-src-bae566e829037425feb67b04dda3a1f5ecbeb933.zip FreeBSD-src-bae566e829037425feb67b04dda3a1f5ecbeb933.tar.gz |
Replace description on how to do CVS imports on this module with a
description on how to do SVN imports on this module.
Approved by: bde (implicit)
-rw-r--r-- | share/zoneinfo/Makefile | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile index 0a0b5a5..ece7df4 100644 --- a/share/zoneinfo/Makefile +++ b/share/zoneinfo/Makefile @@ -3,27 +3,31 @@ # # HOW TO UPDATE THE ZONEINFO DATA # -# In a clean directory, unpack the distribution archive and run: +# With the use of subversion, this is a little bit simpler than the CVS method. # -# $ cvs -d :ext:ncvs.freebsd.org:/home/ncvs import -b 1.1.2 \ -# src/share/zoneinfo ADO tzdataYYYYt +# Import the new sources to the vendor branch: # -# where YYYYt is the year and the version of the distribution, for -# example 2004h. +# $ cd ~/svn/vendor/tzdata/dist +# $ tar zxvf /usr/ports/distfile/tzdata2008X.tar.gz +# (check with "svn stat" and "svn diff" if it all makes sense) +# $ svn commit # Commit message: "Vendor import of tzdata2008X (+details)" # -# Then go to the checked out source, and merge the changes from the -# previous tag to the new tag in the HEAD: +# Tag it # -# $ cd ../src/share/zoneinfo -# $ cvs update -jtzdataYYYYp -j tzdataYYYYt +# $ cd ~/svn/vendor/tzdata +# $ svn cp svn+ssh://svn.freebsd.org/base/vendor/tzdata/dist \ +# svn+ssh://svn.freebsd.org/base/vendor/tzdata/tzdata2008X +# $ svn update # -# Update it again: -# -# $ cvs update +# Merge-from-vendor # -# And push it back into CVS: -# -# $ cvs ci +# $ cd ~svn/head/share/zoneinfo +# $ svn update +# $ svn merge --accept=postpone \ +# svn+ssh://svn.freebsd.org/base/vendor/tzdata/dist . +# $ svn diff --no-diff-deleted \ +# --old=svn+ssh://svn.freebsd.org/base/vendor/tzdata/dist --new=. +# $ svn commit # CLEANFILES+= yearistype |