From 5be06c299e3938e5a324ef2cd76545a15d13390c Mon Sep 17 00:00:00 2001 From: edwin Date: Tue, 14 Oct 2008 04:09:33 +0000 Subject: update the manual on how to import and MFV new tzdata releases --- share/zoneinfo/Makefile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'share/zoneinfo') diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile index ece7df4..e254277 100644 --- a/share/zoneinfo/Makefile +++ b/share/zoneinfo/Makefile @@ -17,17 +17,15 @@ # $ 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 +# $ svn update # Commit message: "Tag of tzdata2008X" # # Merge-from-vendor # -# $ cd ~svn/head/share/zoneinfo +# $ cd ~/svn/head/share/zoneinfo # $ svn update -# $ svn merge --accept=postpone \ +# $ svn merge -c X --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 +# $ svn update # Commit message: "MFV of tzdata2008X" # CLEANFILES+= yearistype -- cgit v1.1