Add missing @OVERRIDE to 'India' config file, per Michael Fuhr.

Add $PostgreSQL$ lines for CVS identity, too.

diff --git a/src/timezone/tznames/Africa.txt b/src/timezone/tznames/Africa.txt
index ccbced3465b19d977b845c90f91a90af82d437af..c0fc16de5418735fde8894029340d1bd560d1833 100644 (file)
--- a/src/timezone/tznames/Africa.txt
+++ b/src/timezone/tznames/Africa.txt
@@ -4,6 +4,8 @@
 #   a template for timezones you could need.  See the `Date/Time Support'
 #   appendix in the PostgreSQL documentation for more information.
 #
+# $PostgreSQL: pgsql/src/timezone/tznames/Africa.txt,v 1.2 2006/07/25 13:49:21 tgl Exp $
+#
 
 CAT      7200    # Central Africa Time
                  #     (Africa/Blantyre)

diff --git a/src/timezone/tznames/America.txt b/src/timezone/tznames/America.txt
index 4a27df425a28109f6fdf50d9c6b143760bc30cc6..218b4015b5e6911c8bddf708ef3cd3afef9a8d51 100644 (file)
--- a/src/timezone/tznames/America.txt
+++ b/src/timezone/tznames/America.txt
@@ -4,6 +4,8 @@
 #   a template for timezones you could need.  See the `Date/Time Support'
 #   appendix in the PostgreSQL documentation for more information.
 #
+# $PostgreSQL: pgsql/src/timezone/tznames/America.txt,v 1.2 2006/07/25 13:49:21 tgl Exp $
+#
 
 # Acre time is sometimes called Acre Standard Time (AST) which leads to a
 # conflict with AST (see below at AST)

diff --git a/src/timezone/tznames/Antarctica.txt b/src/timezone/tznames/Antarctica.txt
index 6f3069f1b3ee62f61d8ee230cf077a8e39a7b698..22b06f90986e0a9503afa1eda3cad2c27b2b1592 100644 (file)
--- a/src/timezone/tznames/Antarctica.txt
+++ b/src/timezone/tznames/Antarctica.txt
@@ -4,6 +4,8 @@
 #   a template for timezones you could need.  See the `Date/Time Support'
 #   appendix in the PostgreSQL documentation for more information.
 #
+# $PostgreSQL: pgsql/src/timezone/tznames/Antarctica.txt,v 1.2 2006/07/25 13:49:21 tgl Exp $
+#
 
 CLST   -10800 D  # Chile Summer Time
                  #     (America/Santiago)

diff --git a/src/timezone/tznames/Asia.txt b/src/timezone/tznames/Asia.txt
index 70c3a2e28ea1152009e399436576f47bcc3912a5..c5aa41873a95daee2a4bfea82c807fc0d352dfb2 100644 (file)
--- a/src/timezone/tznames/Asia.txt
+++ b/src/timezone/tznames/Asia.txt
@@ -4,6 +4,8 @@
 #   a template for timezones you could need.  See the `Date/Time Support'
 #   appendix in the PostgreSQL documentation for more information.
 #
+# $PostgreSQL: pgsql/src/timezone/tznames/Asia.txt,v 1.2 2006/07/25 13:49:21 tgl Exp $
+#
 
 # CONFLICT! ADT is not unique
 # Other timezones:

diff --git a/src/timezone/tznames/Atlantic.txt b/src/timezone/tznames/Atlantic.txt
index 5c447d9c92e44155a4a8ceadeef62f298459517f..a74c8e44de973c5f7d0df9d6f665a0a078ecc99c 100644 (file)
--- a/src/timezone/tznames/Atlantic.txt
+++ b/src/timezone/tznames/Atlantic.txt
@@ -4,6 +4,8 @@
 #   a template for timezones you could need.  See the `Date/Time Support'
 #   appendix in the PostgreSQL documentation for more information.
 #
+# $PostgreSQL: pgsql/src/timezone/tznames/Atlantic.txt,v 1.2 2006/07/25 13:49:21 tgl Exp $
+#
 
 # CONFLICT! ADT is not unique
 # Other timezones:

diff --git a/src/timezone/tznames/Australia b/src/timezone/tznames/Australia
index a47d5d338688769b47d99a3eb0f4357bdbd23f2c..a55f5088b47e86b79ef2e9a84d80592828910569 100644 (file)
--- a/src/timezone/tznames/Australia
+++ b/src/timezone/tznames/Australia
@@ -3,6 +3,8 @@
 # In order to use this file, you need to set the run-time parameter
 # timezone_abbreviations to 'Australia'.  See the `Date/Time Support'
 #   appendix in the PostgreSQL documentation for more information.
+#
+# $PostgreSQL: pgsql/src/timezone/tznames/Australia,v 1.2 2006/07/25 13:49:21 tgl Exp $
 
 
 # include the default set

diff --git a/src/timezone/tznames/Australia.txt b/src/timezone/tznames/Australia.txt
index 0fdad5d1c9eae9725f74cbdc077350709165b586..e790a1dd11f17c4203ae53402f51458ae1996e45 100644 (file)
--- a/src/timezone/tznames/Australia.txt
+++ b/src/timezone/tznames/Australia.txt
@@ -4,6 +4,8 @@
 #   a template for timezones you could need.  See the `Date/Time Support'
 #   appendix in the PostgreSQL documentation for more information.
 #
+# $PostgreSQL: pgsql/src/timezone/tznames/Australia.txt,v 1.2 2006/07/25 13:49:21 tgl Exp $
+#
 
 ACSST   37800 D  # Central Australia (not in zic)
 # CONFLICT! ACST is not unique

diff --git a/src/timezone/tznames/Default b/src/timezone/tznames/Default
index dfadd22af1363e3bbfb6e3fdb95049af60b3f545..ca956ea7a17c09d884062bd90a92988e72878b39 100644 (file)
--- a/src/timezone/tznames/Default
+++ b/src/timezone/tznames/Default
@@ -3,6 +3,8 @@
 # In order to use this file, you need to set the run-time parameter
 # timezone_abbreviations to 'Default'.  See the `Date/Time Support'
 # appendix in the PostgreSQL documentation for more information.
+#
+# $PostgreSQL: pgsql/src/timezone/tznames/Default,v 1.2 2006/07/25 13:49:21 tgl Exp $
 
 
 #################### AFRICA ####################

diff --git a/src/timezone/tznames/Etc.txt b/src/timezone/tznames/Etc.txt
index 9d8d15f055b918860409231b78559ad2897a4656..9d0481d49a3f85fd9ac23a10d5b82b410914c514 100644 (file)
--- a/src/timezone/tznames/Etc.txt
+++ b/src/timezone/tznames/Etc.txt
@@ -4,6 +4,8 @@
 #   a template for timezones you could need.  See the `Date/Time Support'
 #   appendix in the PostgreSQL documentation for more information.
 #
+# $PostgreSQL: pgsql/src/timezone/tznames/Etc.txt,v 1.2 2006/07/25 13:49:21 tgl Exp $
+#
 
 GMT         0    # Greenwich Mean Time
                  #     (Africa/Abidjan)

diff --git a/src/timezone/tznames/Europe.txt b/src/timezone/tznames/Europe.txt
index 19839a69a01896080b869962066e015558549eac..206dbf3a24ccdb947175654928a33752f4f8c5a5 100644 (file)
--- a/src/timezone/tznames/Europe.txt
+++ b/src/timezone/tznames/Europe.txt
@@ -4,6 +4,8 @@
 #   a template for timezones you could need.  See the `Date/Time Support'
 #   appendix in the PostgreSQL documentation for more information.
 #
+# $PostgreSQL: pgsql/src/timezone/tznames/Europe.txt,v 1.2 2006/07/25 13:49:21 tgl Exp $
+#
 
 BST      3600 D  # British Summer Time
                  # Brazil Standard Time

diff --git a/src/timezone/tznames/India b/src/timezone/tznames/India
index 11e4d126093778858feb84f48dda27910ff6b578..05b404dae89dcebac6cd9ed4a4d504513288875e 100644 (file)
--- a/src/timezone/tznames/India
+++ b/src/timezone/tznames/India
@@ -3,10 +3,17 @@
 # In order to use this file, you need to set the run-time parameter
 # timezone_abbreviations to 'India'.  See the `Date/Time Support'
 # appendix in the PostgreSQL documentation for more information.
+#
+# $PostgreSQL: pgsql/src/timezone/tznames/India,v 1.2 2006/07/25 13:49:21 tgl Exp $
 
 
 # include the default set
 @INCLUDE Default
 
+# most timezones are already defined in the default set. With the OVERRIDE
+# option, PostgreSQL will use the new definitions instead of throwing an error
+# in case of a conflict.
+@OVERRIDE
+
 IST     19800    # Indian Standard Time
                  #     (Asia/Calcutta)

diff --git a/src/timezone/tznames/Indian.txt b/src/timezone/tznames/Indian.txt
index 06a880ecc98255a42639da6fd3bb324d2573e04c..f2a5dd37d73ff06969e065ba561e31f233c68142 100644 (file)
--- a/src/timezone/tznames/Indian.txt
+++ b/src/timezone/tznames/Indian.txt
@@ -4,6 +4,8 @@
 #   a template for timezones you could need.  See the `Date/Time Support'
 #   appendix in the PostgreSQL documentation for more information.
 #
+# $PostgreSQL: pgsql/src/timezone/tznames/Indian.txt,v 1.2 2006/07/25 13:49:21 tgl Exp $
+#
 
 CCT     23400    # Cocos Islands Time (Indian Ocean)
                  #     (Indian/Cocos)

diff --git a/src/timezone/tznames/Pacific.txt b/src/timezone/tznames/Pacific.txt
index 1616b939f798e4b8bcd6587ec96964140e718b88..dad2d483d1171216843566d54bf4e7742ec72c01 100644 (file)
--- a/src/timezone/tznames/Pacific.txt
+++ b/src/timezone/tznames/Pacific.txt
@@ -4,6 +4,8 @@
 #   a template for timezones you could need.  See the `Date/Time Support'
 #   appendix in the PostgreSQL documentation for more information.
 #
+# $PostgreSQL: pgsql/src/timezone/tznames/Pacific.txt,v 1.2 2006/07/25 13:49:21 tgl Exp $
+#
 
 CHADT   49500 D  # Chatham Daylight Time (New Zealand)
                  #     (Pacific/Chatham)

diff --git a/src/timezone/tznames/README b/src/timezone/tznames/README
index ce4538873e28c4b64097df8c0c3b6df3609e0d24..3b1bdcce50a87ce150cca655b4f611a1eae006dc 100644 (file)
--- a/src/timezone/tznames/README
+++ b/src/timezone/tznames/README
@@ -16,3 +16,7 @@ If you do not find an appropriate set of time zone names for your geographic
 location supplied here, please report this to <pgsql-hackers@postgresql.org>.
 Your set of time zone names can then be included in future releases.
 For the time being you can always add your own set.
+
+The files named Africa.txt, etc, are not intended to be used directly as
+timezone abbreviation files.  They contain reference definitions of timezone
+names that can be copied into a custom abbreviation file as needed.