From bd112776cdacbe60f7e09fdbcba5061b90618e5e Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Tue, 25 Jul 2006 13:49:21 +0000
Subject: [PATCH] Add missing @OVERRIDE to 'India' config file, per Michael
 Fuhr. Add $PostgreSQL$ lines for CVS identity, too.

---
 src/timezone/tznames/Africa.txt     | 2 ++
 src/timezone/tznames/America.txt    | 2 ++
 src/timezone/tznames/Antarctica.txt | 2 ++
 src/timezone/tznames/Asia.txt       | 2 ++
 src/timezone/tznames/Atlantic.txt   | 2 ++
 src/timezone/tznames/Australia      | 2 ++
 src/timezone/tznames/Australia.txt  | 2 ++
 src/timezone/tznames/Default        | 2 ++
 src/timezone/tznames/Etc.txt        | 2 ++
 src/timezone/tznames/Europe.txt     | 2 ++
 src/timezone/tznames/India          | 7 +++++++
 src/timezone/tznames/Indian.txt     | 2 ++
 src/timezone/tznames/Pacific.txt    | 2 ++
 src/timezone/tznames/README         | 4 ++++
 14 files changed, 35 insertions(+)

diff --git a/src/timezone/tznames/Africa.txt b/src/timezone/tznames/Africa.txt
index ccbced3465..c0fc16de54 100644
--- 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 4a27df425a..218b4015b5 100644
--- 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 6f3069f1b3..22b06f9098 100644
--- 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 70c3a2e28e..c5aa41873a 100644
--- 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 5c447d9c92..a74c8e44de 100644
--- 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 a47d5d3386..a55f5088b4 100644
--- 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 0fdad5d1c9..e790a1dd11 100644
--- 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 dfadd22af1..ca956ea7a1 100644
--- 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 9d8d15f055..9d0481d49a 100644
--- 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 19839a69a0..206dbf3a24 100644
--- 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 11e4d12609..05b404dae8 100644
--- 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 06a880ecc9..f2a5dd37d7 100644
--- 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 1616b939f7..dad2d483d1 100644
--- 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 ce4538873e..3b1bdcce50 100644
--- 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.