diff options
| author | Edwin Groothuis <edwin@FreeBSD.org> | 2008-10-14 04:09:33 +0000 |
|---|---|---|
| committer | Edwin Groothuis <edwin@FreeBSD.org> | 2008-10-14 04:09:33 +0000 |
| commit | 4d3caeacf3219f91563e3b6d08f39f5cf3dc3543 (patch) | |
| tree | b6426ae9a656617e5f75e1fe6fae1f0bac897920 /share/zoneinfo | |
| parent | 0e8b35255249a88f20b9f9bcfa7566fa74af5ffd (diff) | |
Notes
Diffstat (limited to 'share/zoneinfo')
| -rw-r--r-- | share/zoneinfo/Makefile | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile index ece7df4c7f2e..e25427779794 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 |