(unnamed)

text/plain

Filename: (unnamed)
Type: text/plain
Part: 1
Message: Report: removing the inconsistencies in our CVS->git conversion
#!/bin/sh

# Kill some generated files that somehow had patches committed even after
# they were marked dead.
for r in 2.89 2.90 2.91; do rcs -x,v -sdead:$r /cvsroot/pgsql/src/backend/parser/Attic/gram.c ; done
for r in 1.3 1.4 1.5 1.6; do rcs -x,v -sdead:$r /cvsroot/pgsql/src/interfaces/ecpg/preproc/Attic/pgc.c ; done
for r in 1.7 1.8 1.9 1.10 1.11 1.12; do rcs -x,v -sdead:$r /cvsroot/pgsql/src/interfaces/ecpg/preproc/Attic/preproc.c ; done
for r in 1.3 1.4 1.5 1.6 1.7 1.8; do rcs -x,v -sdead:$r /cvsroot/pgsql/src/interfaces/ecpg/preproc/Attic/y.tab.h ; done

# delete WIN32_DEV versions of generated files
rcs -x,v -o1.11.2.1: /cvsroot/pgsql/src/interfaces/ecpg/preproc/Attic/preproc.c
rcs -x,v -nWIN32_DEV /cvsroot/pgsql/src/interfaces/ecpg/preproc/Attic/preproc.c
rcs -x,v -o1.3.2.1: /cvsroot/pgsql/src/interfaces/ecpg/preproc/Attic/preproc.h
rcs -x,v -nWIN32_DEV /cvsroot/pgsql/src/interfaces/ecpg/preproc/Attic/preproc.h
rcs -x,v -o1.5.2.1: /cvsroot/pgsql/src/interfaces/ecpg/preproc/Attic/pgc.c
rcs -x,v -nWIN32_DEV /cvsroot/pgsql/src/interfaces/ecpg/preproc/Attic/pgc.c

rcs -x,v -o2.90.2.1: /cvsroot/pgsql/src/backend/parser/Attic/gram.c
rcs -x,v -nWIN32_DEV /cvsroot/pgsql/src/backend/parser/Attic/gram.c
rcs -x,v -o2.20.2.1: /cvsroot/pgsql/src/backend/parser/Attic/parse.h
rcs -x,v -nWIN32_DEV /cvsroot/pgsql/src/backend/parser/Attic/parse.h
rcs -x,v -o1.38.2.1: /cvsroot/pgsql/src/backend/parser/Attic/scan.c
rcs -x,v -nWIN32_DEV /cvsroot/pgsql/src/backend/parser/Attic/scan.c

rcs -x,v -o1.1.2.1: /cvsroot/pgsql/src/backend/bootstrap/Attic/bootparse.c
rcs -x,v -nWIN32_DEV /cvsroot/pgsql/src/backend/bootstrap/Attic/bootparse.c
rcs -x,v -o1.1.2.1: /cvsroot/pgsql/src/backend/bootstrap/Attic/bootscanner.c
rcs -x,v -nWIN32_DEV /cvsroot/pgsql/src/backend/bootstrap/Attic/bootscanner.c
rcs -x,v -o1.1.2.1: /cvsroot/pgsql/src/backend/bootstrap/Attic/bootstrap_tokens.h
rcs -x,v -nWIN32_DEV /cvsroot/pgsql/src/backend/bootstrap/Attic/bootstrap_tokens.h

# these will have no live versions left at all, so just delete the RCS files
rm -f /cvsroot/pgsql/src/pl/plpgsql/src/Attic/pl.tab.h,v
rm -f /cvsroot/pgsql/src/pl/plpgsql/src/Attic/pl_gram.c,v
rm -f /cvsroot/pgsql/src/pl/plpgsql/src/Attic/pl_scan.c,v

# clean up HISTORY, INSTALL tags messed up by manual tag move
rcs -x,v -nREL7_3_10 /cvsroot/pgsql/Attic/HISTORY
rcs -x,v -nREL7_3_10 /cvsroot/pgsql/Attic/INSTALL

# Not clear how these got tagged ...
rcs -x,v -nREL8_0_23 /cvsroot/pgsql/contrib/xml2/sql/xml2.sql
rcs -x,v -nREL8_0_23 /cvsroot/pgsql/contrib/xml2/expected/xml2.out
rcs -x,v -nREL8_0_23 /cvsroot/pgsql/contrib/xml2/expected/xml2_1.out

# nor how these didn't get tagged ...
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/doc/src/graphics/Attic/catalogs.ag
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/doc/src/graphics/Attic/catalogs.cgm
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/doc/src/graphics/Attic/catalogs.gif
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/doc/src/graphics/Attic/catalogs.ps
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/doc/src/graphics/Attic/clientserver.ag
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/doc/src/graphics/Attic/clientserver.gif
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/doc/src/graphics/Attic/connections.ag
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/doc/src/graphics/Attic/connections.gif
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/src/data/Attic/charset.conf
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/src/data/Attic/isocz-wincz.tab
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/src/data/Attic/koi-alt.tab
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/src/data/Attic/koi-iso.tab
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/src/data/Attic/koi-koi.tab
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/src/data/Attic/koi-mac.tab
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/src/data/Attic/koi-win.tab
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/src/interfaces/cli/Attic/example1.c
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/src/interfaces/cli/Attic/example2.c
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/src/interfaces/cli/Attic/sqlcli.h
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/Makefile
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/connect.c
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/data.c
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/descriptor.c
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/error.c
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/execute.c
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/extern.h
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/memory.c
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/misc.c
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/pg_type.h
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/prepare.c
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/src/interfaces/ecpg/lib/Attic/typename.c
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/src/interfaces/python/Attic/Announce
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/src/interfaces/python/Attic/ChangeLog
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/src/interfaces/python/Attic/GNUmakefile
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/src/interfaces/python/Attic/PyGreSQL.spec
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/src/interfaces/python/Attic/README
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/src/interfaces/python/Attic/Setup.in.raw
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/src/interfaces/python/Attic/pg.py
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/src/interfaces/python/Attic/pgdb.py
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/src/interfaces/python/Attic/pgmodule.c
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/src/interfaces/python/Attic/setup.py
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/src/interfaces/python/tutorial/Attic/advanced.py
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/src/interfaces/python/tutorial/Attic/basics.py
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/src/interfaces/python/tutorial/Attic/func.py
rcs -x,v -nREL7_3_5:REL7_3_4 /cvsroot/pgsql/src/interfaces/python/tutorial/Attic/syscat.py

# another missed tag
rcs -x,v -nrelease-6-3:2.3 /cvsroot/pgsql/src/backend/parser/Attic/gram.c

# Relabel tag REL7_1 as REL7_1_BETA in various files that were deleted between
# the original placement of that tag and its renaming.  The renaming action
# evidently missed files that'd been deleted in between.
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/contrib/linux/Attic/postgres.init.csh
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/contrib/linux/Attic/postgres.init.sh
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/doc/Attic/FAQ_BSDI
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/doc/Attic/README.mb
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/doc/TODO.detail/Attic/cidr
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/doc/TODO.detail/Attic/cnfify
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/doc/TODO.detail/Attic/flock
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/doc/TODO.detail/Attic/function
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/doc/TODO.detail/Attic/inherit
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/doc/TODO.detail/Attic/logging
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/doc/TODO.detail/Attic/memory
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/doc/TODO.detail/Attic/outer
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/doc/TODO.detail/Attic/pglog
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/doc/TODO.detail/Attic/subquery
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/doc/src/sgml/Attic/about.sgml
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/doc/src/sgml/Attic/environ.sgml
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/doc/src/sgml/Attic/intro-ag.sgml
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/doc/src/sgml/Attic/intro-pg.sgml
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/doc/src/sgml/Attic/keys.sgml
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/doc/src/sgml/Attic/oper.sgml
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/doc/src/sgml/Attic/plan.sgml
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/doc/src/sgml/Attic/populate.sgml
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/backend/port/hpux/Attic/port-protos.h
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/backend/storage/lmgr/Attic/single.c
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/bin/pgaccess/lib/Attic/qed
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/include/regex/Attic/cdefs.h
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/include/regex/Attic/regexp.h
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/Attic/README_6.3
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/xa/Attic/Test.java
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/Attic/Connection.java
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/Attic/Driver.java
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/Attic/Field.java
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/Attic/PG_Stream.java
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/Attic/ResultSet.java
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/Attic/errors.properties
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/Attic/errors_fr.properties
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/fastpath/Attic/Fastpath.java
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/fastpath/Attic/FastpathArg.java
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/geometric/Attic/PGbox.java
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/geometric/Attic/PGcircle.java
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/geometric/Attic/PGline.java
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/geometric/Attic/PGlseg.java
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/geometric/Attic/PGpath.java
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/geometric/Attic/PGpoint.java
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/geometric/Attic/PGpolygon.java
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/jdbc1/Attic/CallableStatement.java
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/jdbc1/Attic/Connection.java
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/jdbc1/Attic/DatabaseMetaData.java
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/jdbc1/Attic/PreparedStatement.java
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/jdbc1/Attic/ResultSet.java
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/jdbc1/Attic/ResultSetMetaData.java
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/jdbc1/Attic/Statement.java
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/jdbc2/Attic/CallableStatement.java
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/jdbc2/Attic/Connection.java
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/jdbc2/Attic/DatabaseMetaData.java
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/jdbc2/Attic/PreparedStatement.java
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/jdbc2/Attic/ResultSet.java
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/jdbc2/Attic/ResultSetMetaData.java
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/jdbc2/Attic/Statement.java
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/largeobject/Attic/LargeObject.java
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/largeobject/Attic/LargeObjectManager.java
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/util/Attic/PGmoney.java
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/util/Attic/PGobject.java
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/util/Attic/PGtokenizer.java
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/util/Attic/PSQLException.java
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/util/Attic/Serialize.java
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/util/Attic/UnixCrypt.java
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/interfaces/libpq++/Attic/dependencies
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/pl/plpgsql/Attic/enable_plpgsql
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/pl/plpgsql/src/Attic/mklang.sql.in
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/test/regress/expected/Attic/abstime-1947-PDT.out
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/test/regress/expected/Attic/horology-1947-PDT.out
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/test/regress/expected/Attic/tinterval-1947-PDT.out
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/tools/mkldexport/Attic/Makefile
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/tools/mkldexport/Attic/README
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/tools/mkldexport/Attic/mkldexport.sh
rcs -x,v -nREL7_1_BETA:REL7_1 /cvsroot/pgsql/src/tools/Attic/release_prep

rcs -x,v -nREL7_1 /cvsroot/pgsql/contrib/linux/Attic/postgres.init.csh
rcs -x,v -nREL7_1 /cvsroot/pgsql/contrib/linux/Attic/postgres.init.sh
rcs -x,v -nREL7_1 /cvsroot/pgsql/doc/Attic/FAQ_BSDI
rcs -x,v -nREL7_1 /cvsroot/pgsql/doc/Attic/README.mb
rcs -x,v -nREL7_1 /cvsroot/pgsql/doc/TODO.detail/Attic/cidr
rcs -x,v -nREL7_1 /cvsroot/pgsql/doc/TODO.detail/Attic/cnfify
rcs -x,v -nREL7_1 /cvsroot/pgsql/doc/TODO.detail/Attic/flock
rcs -x,v -nREL7_1 /cvsroot/pgsql/doc/TODO.detail/Attic/function
rcs -x,v -nREL7_1 /cvsroot/pgsql/doc/TODO.detail/Attic/inherit
rcs -x,v -nREL7_1 /cvsroot/pgsql/doc/TODO.detail/Attic/logging
rcs -x,v -nREL7_1 /cvsroot/pgsql/doc/TODO.detail/Attic/memory
rcs -x,v -nREL7_1 /cvsroot/pgsql/doc/TODO.detail/Attic/outer
rcs -x,v -nREL7_1 /cvsroot/pgsql/doc/TODO.detail/Attic/pglog
rcs -x,v -nREL7_1 /cvsroot/pgsql/doc/TODO.detail/Attic/subquery
rcs -x,v -nREL7_1 /cvsroot/pgsql/doc/src/sgml/Attic/about.sgml
rcs -x,v -nREL7_1 /cvsroot/pgsql/doc/src/sgml/Attic/environ.sgml
rcs -x,v -nREL7_1 /cvsroot/pgsql/doc/src/sgml/Attic/intro-ag.sgml
rcs -x,v -nREL7_1 /cvsroot/pgsql/doc/src/sgml/Attic/intro-pg.sgml
rcs -x,v -nREL7_1 /cvsroot/pgsql/doc/src/sgml/Attic/keys.sgml
rcs -x,v -nREL7_1 /cvsroot/pgsql/doc/src/sgml/Attic/oper.sgml
rcs -x,v -nREL7_1 /cvsroot/pgsql/doc/src/sgml/Attic/plan.sgml
rcs -x,v -nREL7_1 /cvsroot/pgsql/doc/src/sgml/Attic/populate.sgml
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/backend/port/hpux/Attic/port-protos.h
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/backend/storage/lmgr/Attic/multi.c
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/backend/storage/lmgr/Attic/single.c
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/bin/pgaccess/lib/Attic/qed
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/include/regex/Attic/cdefs.h
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/include/regex/Attic/regexp.h
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/Attic/README_6.3
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/org/postgresql/xa/Attic/Test.java
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/Attic/Connection.java
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/Attic/Driver.java
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/Attic/Field.java
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/Attic/PG_Stream.java
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/Attic/ResultSet.java
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/Attic/errors.properties
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/Attic/errors_fr.properties
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/fastpath/Attic/Fastpath.java
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/fastpath/Attic/FastpathArg.java
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/geometric/Attic/PGbox.java
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/geometric/Attic/PGcircle.java
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/geometric/Attic/PGline.java
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/geometric/Attic/PGlseg.java
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/geometric/Attic/PGpath.java
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/geometric/Attic/PGpoint.java
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/geometric/Attic/PGpolygon.java
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/jdbc1/Attic/CallableStatement.java
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/jdbc1/Attic/Connection.java
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/jdbc1/Attic/DatabaseMetaData.java
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/jdbc1/Attic/PreparedStatement.java
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/jdbc1/Attic/ResultSet.java
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/jdbc1/Attic/ResultSetMetaData.java
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/jdbc1/Attic/Statement.java
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/jdbc2/Attic/CallableStatement.java
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/jdbc2/Attic/Connection.java
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/jdbc2/Attic/DatabaseMetaData.java
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/jdbc2/Attic/PreparedStatement.java
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/jdbc2/Attic/ResultSet.java
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/jdbc2/Attic/ResultSetMetaData.java
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/jdbc2/Attic/Statement.java
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/largeobject/Attic/LargeObject.java
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/largeobject/Attic/LargeObjectManager.java
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/util/Attic/PGmoney.java
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/util/Attic/PGobject.java
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/util/Attic/PGtokenizer.java
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/util/Attic/PSQLException.java
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/util/Attic/Serialize.java
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/jdbc/postgresql/util/Attic/UnixCrypt.java
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/interfaces/libpq++/Attic/dependencies
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/pl/plpgsql/Attic/enable_plpgsql
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/pl/plpgsql/src/Attic/mklang.sql.in
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/test/regress/expected/Attic/abstime-1947-PDT.out
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/test/regress/expected/Attic/horology-1947-PDT.out
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/test/regress/expected/Attic/tinterval-1947-PDT.out
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/tools/mkldexport/Attic/Makefile
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/tools/mkldexport/Attic/README
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/tools/mkldexport/Attic/mkldexport.sh
rcs -x,v -nREL7_1 /cvsroot/pgsql/src/tools/Attic/release_prep

# Add REL2_0 tag and REL2_0B branch to some files that were missing them
# (probably this was an artifact of the old split-repository kluge)
rcs -x,v -nREL2_0:1.1.1.1 /cvsroot/pgsql/COPYRIGHT
rcs -x,v -nREL2_0:1.1.1.1 /cvsroot/pgsql/Attic/HISTORY
rcs -x,v -nREL2_0:1.9 /cvsroot/pgsql/Attic/INSTALL
rcs -x,v -nREL2_0:1.1.1.1 /cvsroot/pgsql/Attic/MIGRATION_to_1.02.1
rcs -x,v -nREL2_0:1.2 /cvsroot/pgsql/README
rcs -x,v -nREL2_0:1.1.1.1 /cvsroot/pgsql/contrib/array/Attic/array_iterator.c
rcs -x,v -nREL2_0:1.1.1.1 /cvsroot/pgsql/contrib/array/Attic/array_iterator.doc
rcs -x,v -nREL2_0:1.1.1.1 /cvsroot/pgsql/contrib/array/Attic/array_iterator.sql
rcs -x,v -nREL2_0:1.1.1.1 /cvsroot/pgsql/contrib/datetime/Attic/datetime_functions.c
rcs -x,v -nREL2_0:1.1.1.1 /cvsroot/pgsql/contrib/datetime/Attic/datetime_functions.doc
rcs -x,v -nREL2_0:1.1.1.1 /cvsroot/pgsql/contrib/datetime/Attic/datetime_functions.sql
rcs -x,v -nREL2_0:1.3 /cvsroot/pgsql/contrib/pginterface/Attic/Makefile
rcs -x,v -nREL2_0:1.4 /cvsroot/pgsql/contrib/pginterface/Attic/README
rcs -x,v -nREL2_0:1.3 /cvsroot/pgsql/contrib/pginterface/Attic/halt.c
rcs -x,v -nREL2_0:1.3 /cvsroot/pgsql/contrib/pginterface/Attic/halt.h
rcs -x,v -nREL2_0:1.3 /cvsroot/pgsql/contrib/pginterface/Attic/pginsert.c
rcs -x,v -nREL2_0:1.4 /cvsroot/pgsql/contrib/pginterface/Attic/pginterface.c
rcs -x,v -nREL2_0:1.4 /cvsroot/pgsql/contrib/pginterface/Attic/pginterface.h
rcs -x,v -nREL2_0:1.3 /cvsroot/pgsql/contrib/pginterface/Attic/pgnulltest.c
rcs -x,v -nREL2_0:1.3 /cvsroot/pgsql/contrib/pginterface/Attic/pgwordcount.c
rcs -x,v -nREL2_0:1.1.1.1 /cvsroot/pgsql/contrib/soundex/Attic/soundex.c
rcs -x,v -nREL2_0:1.1.1.1 /cvsroot/pgsql/contrib/soundex/Attic/soundex.sql
rcs -x,v -nREL2_0:1.2 /cvsroot/pgsql/contrib/string/Attic/string_io.c
rcs -x,v -nREL2_0:1.1.1.1 /cvsroot/pgsql/contrib/string/Attic/string_io.sql
rcs -x,v -nREL2_0:1.1.1.1 /cvsroot/pgsql/contrib/zap_ltv/Attic/README
rcs -x,v -nREL2_0:1.1.1.1 /cvsroot/pgsql/contrib/zap_ltv/Attic/zap_ltv.pl
rcs -x,v -nREL2_0:1.3 /cvsroot/pgsql/doc/Attic/FAQ
rcs -x,v -nREL2_0:1.2 /cvsroot/pgsql/doc/Attic/FAQ-Irix
rcs -x,v -nREL2_0:1.2 /cvsroot/pgsql/doc/Attic/FAQ-Linux
rcs -x,v -nREL2_0:1.1 /cvsroot/pgsql/doc/Attic/MIGRATION_1.0_to_1.01
rcs -x,v -nREL2_0:1.1.1.1 /cvsroot/pgsql/doc/Attic/README.flex
rcs -x,v -nREL2_0:1.1 /cvsroot/pgsql/doc/Attic/README.fsync
rcs -x,v -nREL2_0:1.1.1.1 /cvsroot/pgsql/doc/Attic/README.support
rcs -x,v -nREL2_0:1.1.1.1 /cvsroot/pgsql/doc/Attic/RELEASE.patchlevel
rcs -x,v -nREL2_0:1.2 /cvsroot/pgsql/doc/TODO
rcs -x,v -nREL2_0:1.1.1.1 /cvsroot/pgsql/doc/bug.template
rcs -x,v -nREL2_0:1.2 /cvsroot/pgsql/doc/Attic/libpgtcl.doc
rcs -x,v -nREL2_0:1.1.1.1 /cvsroot/pgsql/doc/Attic/userguide.ps

rcs -x,v -nREL2_0B:1.1.1.1.0.2 /cvsroot/pgsql/COPYRIGHT
rcs -x,v -nREL2_0B:1.1.1.1.0.2 /cvsroot/pgsql/Attic/HISTORY
rcs -x,v -nREL2_0B:1.9.0.2 /cvsroot/pgsql/Attic/INSTALL
rcs -x,v -nREL2_0B:1.1.1.1.0.2 /cvsroot/pgsql/Attic/MIGRATION_to_1.02.1
rcs -x,v -nREL2_0B:1.2.0.2 /cvsroot/pgsql/README
rcs -x,v -nREL2_0B:1.1.1.1.0.2 /cvsroot/pgsql/contrib/array/Attic/array_iterator.c
rcs -x,v -nREL2_0B:1.1.1.1.0.2 /cvsroot/pgsql/contrib/array/Attic/array_iterator.doc
rcs -x,v -nREL2_0B:1.1.1.1.0.2 /cvsroot/pgsql/contrib/array/Attic/array_iterator.sql
rcs -x,v -nREL2_0B:1.1.1.1.0.2 /cvsroot/pgsql/contrib/datetime/Attic/datetime_functions.c
rcs -x,v -nREL2_0B:1.1.1.1.0.2 /cvsroot/pgsql/contrib/datetime/Attic/datetime_functions.doc
rcs -x,v -nREL2_0B:1.1.1.1.0.2 /cvsroot/pgsql/contrib/datetime/Attic/datetime_functions.sql
rcs -x,v -nREL2_0B:1.3.0.2 /cvsroot/pgsql/contrib/pginterface/Attic/Makefile
rcs -x,v -nREL2_0B:1.4.0.2 /cvsroot/pgsql/contrib/pginterface/Attic/README
rcs -x,v -nREL2_0B:1.3.0.2 /cvsroot/pgsql/contrib/pginterface/Attic/halt.c
rcs -x,v -nREL2_0B:1.3.0.2 /cvsroot/pgsql/contrib/pginterface/Attic/halt.h
rcs -x,v -nREL2_0B:1.3.0.2 /cvsroot/pgsql/contrib/pginterface/Attic/pginsert.c
rcs -x,v -nREL2_0B:1.4.0.2 /cvsroot/pgsql/contrib/pginterface/Attic/pginterface.c
rcs -x,v -nREL2_0B:1.4.0.2 /cvsroot/pgsql/contrib/pginterface/Attic/pginterface.h
rcs -x,v -nREL2_0B:1.3.0.2 /cvsroot/pgsql/contrib/pginterface/Attic/pgnulltest.c
rcs -x,v -nREL2_0B:1.3.0.2 /cvsroot/pgsql/contrib/pginterface/Attic/pgwordcount.c
rcs -x,v -nREL2_0B:1.1.1.1.0.2 /cvsroot/pgsql/contrib/soundex/Attic/soundex.c
rcs -x,v -nREL2_0B:1.1.1.1.0.2 /cvsroot/pgsql/contrib/soundex/Attic/soundex.sql
rcs -x,v -nREL2_0B:1.2.0.2 /cvsroot/pgsql/contrib/string/Attic/string_io.c
rcs -x,v -nREL2_0B:1.1.1.1.0.2 /cvsroot/pgsql/contrib/string/Attic/string_io.sql
rcs -x,v -nREL2_0B:1.1.1.1.0.2 /cvsroot/pgsql/contrib/zap_ltv/Attic/README
rcs -x,v -nREL2_0B:1.1.1.1.0.2 /cvsroot/pgsql/contrib/zap_ltv/Attic/zap_ltv.pl
rcs -x,v -nREL2_0B:1.3.0.2 /cvsroot/pgsql/doc/Attic/FAQ
rcs -x,v -nREL2_0B:1.2.0.2 /cvsroot/pgsql/doc/Attic/FAQ-Irix
rcs -x,v -nREL2_0B:1.2.0.2 /cvsroot/pgsql/doc/Attic/FAQ-Linux
rcs -x,v -nREL2_0B:1.1.0.2 /cvsroot/pgsql/doc/Attic/MIGRATION_1.0_to_1.01
rcs -x,v -nREL2_0B:1.1.1.1.0.2 /cvsroot/pgsql/doc/Attic/README.flex
rcs -x,v -nREL2_0B:1.1.0.8 /cvsroot/pgsql/doc/Attic/README.fsync
rcs -x,v -nREL2_0B:1.1.1.1.0.2 /cvsroot/pgsql/doc/Attic/README.support
rcs -x,v -nREL2_0B:1.1.1.1.0.2 /cvsroot/pgsql/doc/Attic/RELEASE.patchlevel
rcs -x,v -nREL2_0B:1.2.0.2 /cvsroot/pgsql/doc/TODO
rcs -x,v -nREL2_0B:1.1.1.1.0.2 /cvsroot/pgsql/doc/bug.template
rcs -x,v -nREL2_0B:1.2.0.2 /cvsroot/pgsql/doc/Attic/libpgtcl.doc
rcs -x,v -nREL2_0B:1.1.1.1.0.2 /cvsroot/pgsql/doc/Attic/userguide.ps

# Finally, manually patch assorted files in which the file was added to
# mainline and then back-patched into release branches at a significantly
# later point.  The CVS repository fails to show that these files didn't
# exist on the back branch right along, so we need a hack to show that.

cd /cvsroot

chmod u+w pgsql/contrib/cube/expected/cube_1.out,v
chmod u+w pgsql/doc/Attic/FAQ_HPUX,v
chmod u+w pgsql/doc/Attic/FAQ_czeck,v
chmod u+w pgsql/doc/Attic/FAQ_hungarian,v
chmod u+w pgsql/doc/Attic/FAQ_turkish,v
chmod u+w pgsql/doc/src/FAQ/Attic/FAQ_czech.html,v
chmod u+w pgsql/doc/src/FAQ/Attic/FAQ_hungarian.html,v
chmod u+w pgsql/doc/src/FAQ/Attic/FAQ_turkish.html,v
chmod u+w pgsql/src/backend/utils/cache/typcache.c,v
chmod u+w pgsql/src/bin/pg_dump/po/it.po,v
chmod u+w pgsql/src/include/utils/typcache.h,v
chmod u+w pgsql/src/port/unsetenv.c,v
chmod u+w pgsql/src/test/regress/expected/geometry_2.out,v
chmod u+w pgsql/src/test/regress/expected/update.out,v
chmod u+w pgsql/src/test/regress/sql/update.sql,v
chmod u+w pgsql/src/win32/Attic/ipc.patch,v

patch -p1 <<EOFEOF
diff -cr repo/pgsql/contrib/cube/expected/cube_1.out,v repo.patched/pgsql/contrib/cube/expected/cube_1.out,v
*** repo/pgsql/contrib/cube/expected/cube_1.out,v	Sat Sep  4 07:18:25 2010
--- repo.patched/pgsql/contrib/cube/expected/cube_1.out,v	Sat Sep 11 15:28:45 2010
***************
*** 213,220 ****
  1.2
  date	2005.06.27.01.19.43;	author tgl;	state Exp;
  branches
! 	1.2.2.1
! 	1.2.4.1;
  next	1.1;
  
  1.1
--- 213,220 ----
  1.2
  date	2005.06.27.01.19.43;	author tgl;	state Exp;
  branches
! 	1.2.2.0
! 	1.2.4.0;
  next	1.1;
  
  1.1
***************
*** 222,232 ****
--- 222,242 ----
  branches;
  next	;
  
+ 1.2.2.0
+ date	2005.06.27.01.19.43;	author tgl;	state dead;
+ branches;
+ next	1.2.2.1;
+ 
  1.2.2.1
  date	2005.07.16.20.11.12;	author tgl;	state Exp;
  branches;
  next	;
  
+ 1.2.4.0
+ date	2005.06.27.01.19.43;	author tgl;	state dead;
+ branches;
+ next	1.2.4.1;
+ 
  1.2.4.1
  date	2005.07.17.17.36.56;	author tgl;	state Exp;
  branches;
***************
*** 1672,1677 ****
--- 1682,1695 ----
  @
  
  
+ 1.2.4.0
+ log
+ @Mark branch as deleted.
+ @
+ text
+ @@
+ 
+ 
  1.2.4.1
  log
  @Looks like cube_1 variant is also needed in 7.3 branch.
***************
*** 2086,2091 ****
--- 2104,2117 ----
  @
  
  
+ 1.2.2.0
+ log
+ @Mark branch as deleted.
+ @
+ text
+ @@
+ 
+ 
  1.2.2.1
  log
  @cube_1 variant is needed in 7.4 branch, per results from buildfarm
diff -cr repo/pgsql/doc/Attic/FAQ_HPUX,v repo.patched/pgsql/doc/Attic/FAQ_HPUX,v
*** repo/pgsql/doc/Attic/FAQ_HPUX,v	Thu May 13 23:44:40 2010
--- repo.patched/pgsql/doc/Attic/FAQ_HPUX,v	Sun Sep 12 12:39:34 2010
***************
*** 283,291 ****
  1.1
  date	98.11.28.23.10.22;	author tgl;	state Exp;
  branches
! 	1.1.2.1;
  next	;
  
  1.1.2.1
  date	98.12.18.05.25.57;	author momjian;	state Exp;
  branches;
--- 283,296 ----
  1.1
  date	98.11.28.23.10.22;	author tgl;	state Exp;
  branches
! 	1.1.2.0;
  next	;
  
+ 1.1.2.0
+ date	98.11.28.23.10.22;	author tgl;	state dead;
+ branches;
+ next	1.1.2.1;
+ 
  1.1.2.1
  date	98.12.18.05.25.57;	author momjian;	state Exp;
  branches;
***************
*** 1314,1319 ****
--- 1319,1332 ----
  @
  
  
+ 1.1.2.0
+ log
+ @Mark branch as deleted.
+ @
+ text
+ @@
+ 
+ 
  1.1.2.1
  log
  @Prepare for 6.4.1.
diff -cr repo/pgsql/doc/Attic/FAQ_czeck,v repo.patched/pgsql/doc/Attic/FAQ_czeck,v
*** repo/pgsql/doc/Attic/FAQ_czeck,v	Tue Dec 16 04:47:55 2003
--- repo.patched/pgsql/doc/Attic/FAQ_czeck,v	Sun Sep 12 15:32:47 2010
***************
*** 14,22 ****
  1.1
  date	2003.12.13.16.56.00;	author momjian;	state Exp;
  branches
! 	1.1.2.1;
  next	;
  
  1.1.2.1
  date	2003.12.15.15.30.17;	author momjian;	state Exp;
  branches;
--- 14,27 ----
  1.1
  date	2003.12.13.16.56.00;	author momjian;	state Exp;
  branches
! 	1.1.2.0;
  next	;
  
+ 1.1.2.0
+ date	2003.12.13.16.56.00;	author momjian;	state dead;
+ branches;
+ next	1.1.2.1;
+ 
  1.1.2.1
  date	2003.12.15.15.30.17;	author momjian;	state Exp;
  branches;
***************
*** 1239,1244 ****
--- 1244,1257 ----
  @@
  
  
+ 1.1.2.0
+ log
+ @Mark branch as deleted.
+ @
+ text
+ @@
+ 
+ 
  1.1.2.1
  log
  @Add Czech FAQ to 7.4.X branch.
diff -cr repo/pgsql/doc/Attic/FAQ_hungarian,v repo.patched/pgsql/doc/Attic/FAQ_hungarian,v
*** repo/pgsql/doc/Attic/FAQ_hungarian,v	Thu May 13 23:44:40 2010
--- repo.patched/pgsql/doc/Attic/FAQ_hungarian,v	Sat Sep 11 12:39:17 2010
***************
*** 190,196 ****
  1.3
  date	2003.02.18.17.20.37;	author momjian;	state Exp;
  branches
! 	1.3.2.1
  	1.3.10.1;
  next	1.2;
  
--- 190,196 ----
  1.3
  date	2003.02.18.17.20.37;	author momjian;	state Exp;
  branches
! 	1.3.2.0
  	1.3.10.1;
  next	1.2;
  
***************
*** 204,209 ****
--- 204,214 ----
  branches;
  next	;
  
+ 1.3.2.0
+ date	2003.02.18.17.20.37;	author momjian;	state dead;
+ branches;
+ next	1.3.2.1;
+ 
  1.3.2.1
  date	2003.07.24.00.53.56;	author momjian;	state Exp;
  branches;
***************
*** 3986,3991 ****
--- 3991,4004 ----
  @
  
  
+ 1.3.2.0
+ log
+ @Mark branch as deleted.
+ @
+ text
+ @@
+ 
+ 
  1.3.2.1
  log
  @Add Hungarian/Turkish FAQ's to 7.3.4.
diff -cr repo/pgsql/doc/Attic/FAQ_turkish,v repo.patched/pgsql/doc/Attic/FAQ_turkish,v
*** repo/pgsql/doc/Attic/FAQ_turkish,v	Thu May 13 23:44:40 2010
--- repo.patched/pgsql/doc/Attic/FAQ_turkish,v	Sun Sep 12 12:39:41 2010
***************
*** 244,252 ****
  1.1
  date	2003.06.02.18.16.56;	author momjian;	state Exp;
  branches
! 	1.1.2.1;
  next	;
  
  1.1.2.1
  date	2003.07.24.00.53.57;	author momjian;	state Exp;
  branches;
--- 244,257 ----
  1.1
  date	2003.06.02.18.16.56;	author momjian;	state Exp;
  branches
! 	1.1.2.0;
  next	;
  
+ 1.1.2.0
+ date	2003.06.02.18.16.56;	author momjian;	state dead;
+ branches;
+ next	1.1.2.1;
+ 
  1.1.2.1
  date	2003.07.24.00.53.57;	author momjian;	state Exp;
  branches;
***************
*** 6086,6091 ****
--- 6091,6104 ----
  @
  
  
+ 1.1.2.0
+ log
+ @Mark branch as deleted.
+ @
+ text
+ @@
+ 
+ 
  1.1.2.1
  log
  @Add Hungarian/Turkish FAQ's to 7.3.4.
diff -cr repo/pgsql/doc/src/FAQ/Attic/FAQ_czech.html,v repo.patched/pgsql/doc/src/FAQ/Attic/FAQ_czech.html,v
*** repo/pgsql/doc/src/FAQ/Attic/FAQ_czech.html,v	Thu May 13 23:44:41 2010
--- repo.patched/pgsql/doc/src/FAQ/Attic/FAQ_czech.html,v	Sun Sep 12 15:31:27 2010
***************
*** 205,213 ****
  1.1
  date	2003.12.13.16.56.00;	author momjian;	state Exp;
  branches
! 	1.1.2.1;
  next	;
  
  1.1.2.1
  date	2003.12.15.15.30.17;	author momjian;	state Exp;
  branches;
--- 205,218 ----
  1.1
  date	2003.12.13.16.56.00;	author momjian;	state Exp;
  branches
! 	1.1.2.0;
  next	;
  
+ 1.1.2.0
+ date	2003.12.13.16.56.00;	author momjian;	state dead;
+ branches;
+ next	1.1.2.1;
+ 
  1.1.2.1
  date	2003.12.15.15.30.17;	author momjian;	state Exp;
  branches;
***************
*** 3457,3462 ****
--- 3462,3475 ----
  </body></html>@
  
  
+ 1.1.2.0
+ log
+ @Mark branch as deleted.
+ @
+ text
+ @@
+ 
+ 
  1.1.2.1
  log
  @Add Czech FAQ to 7.4.X branch.
diff -cr repo/pgsql/doc/src/FAQ/Attic/FAQ_hungarian.html,v repo.patched/pgsql/doc/src/FAQ/Attic/FAQ_hungarian.html,v
*** repo/pgsql/doc/src/FAQ/Attic/FAQ_hungarian.html,v	Thu May 13 23:39:10 2010
--- repo.patched/pgsql/doc/src/FAQ/Attic/FAQ_hungarian.html,v	Sat Sep 11 12:39:17 2010
***************
*** 111,117 ****
  1.3
  date	2005.06.06.16.30.42;	author momjian;	state Exp;
  branches
! 	1.3.2.1
  	1.3.10.1;
  next	1.2;
  
--- 111,117 ----
  1.3
  date	2005.06.06.16.30.42;	author momjian;	state Exp;
  branches
! 	1.3.2.0
  	1.3.10.1;
  next	1.2;
  
***************
*** 125,130 ****
--- 125,135 ----
  branches;
  next	;
  
+ 1.3.2.0
+ date	2005.06.06.16.30.42;	author momjian;	state dead;
+ branches;
+ next	1.3.2.1;
+ 
  1.3.2.1
  date	2005.10.04.14.17.44;	author momjian;	state Exp;
  branches;
***************
*** 1850,1855 ****
--- 1855,1868 ----
  @@
  
  
+ 1.3.2.0
+ log
+ @Mark branch as deleted.
+ @
+ text
+ @@
+ 
+ 
  1.3.2.1
  log
  @Add FAQ_hungarian.html to 8.0.X branch.
diff -cr repo/pgsql/doc/src/FAQ/Attic/FAQ_turkish.html,v repo.patched/pgsql/doc/src/FAQ/Attic/FAQ_turkish.html,v
*** repo/pgsql/doc/src/FAQ/Attic/FAQ_turkish.html,v	Thu May 13 23:44:41 2010
--- repo.patched/pgsql/doc/src/FAQ/Attic/FAQ_turkish.html,v	Sun Sep 12 12:39:47 2010
***************
*** 254,262 ****
  1.1
  date	2003.06.02.18.16.56;	author momjian;	state Exp;
  branches
! 	1.1.2.1;
  next	;
  
  1.1.2.1
  date	2003.07.24.00.53.57;	author momjian;	state Exp;
  branches;
--- 254,267 ----
  1.1
  date	2003.06.02.18.16.56;	author momjian;	state Exp;
  branches
! 	1.1.2.0;
  next	;
  
+ 1.1.2.0
+ date	2003.06.02.18.16.56;	author momjian;	state dead;
+ branches;
+ next	1.1.2.1;
+ 
  1.1.2.1
  date	2003.07.24.00.53.57;	author momjian;	state Exp;
  branches;
***************
*** 6175,6180 ****
--- 6180,6193 ----
  @
  
  
+ 1.1.2.0
+ log
+ @Mark branch as deleted.
+ @
+ text
+ @@
+ 
+ 
  1.1.2.1
  log
  @Add Hungarian/Turkish FAQ's to 7.3.4.
diff -cr repo/pgsql/src/backend/utils/cache/typcache.c,v repo.patched/pgsql/src/backend/utils/cache/typcache.c,v
*** repo/pgsql/src/backend/utils/cache/typcache.c,v	Sat Sep  4 07:18:40 2010
--- repo.patched/pgsql/src/backend/utils/cache/typcache.c,v	Sun Sep 12 10:38:01 2010
***************
*** 346,354 ****
  1.1
  date	2003.08.17.19.58.06;	author tgl;	state Exp;
  branches
! 	1.1.2.1;
  next	;
  
  1.1.2.1
  date	2003.09.07.04.36.55;	author momjian;	state Exp;
  branches;
--- 346,359 ----
  1.1
  date	2003.08.17.19.58.06;	author tgl;	state Exp;
  branches
! 	1.1.2.0;
  next	;
  
+ 1.1.2.0
+ date	2003.08.17.19.58.06;	author tgl;	state dead;
+ branches;
+ next	1.1.2.1;
+ 
  1.1.2.1
  date	2003.09.07.04.36.55;	author momjian;	state Exp;
  branches;
***************
*** 2465,2470 ****
--- 2470,2483 ----
  @
  
  
+ 1.1.2.0
+ log
+ @Mark branch as deleted.
+ @
+ text
+ @@
+ 
+ 
  1.1.2.1
  log
  @Update this branch to match CVS head, includes WIN32 improvements.
diff -cr repo/pgsql/src/bin/pg_dump/po/it.po,v repo.patched/pgsql/src/bin/pg_dump/po/it.po,v
*** repo/pgsql/src/bin/pg_dump/po/it.po,v	Sat Sep  4 07:18:42 2010
--- repo.patched/pgsql/src/bin/pg_dump/po/it.po,v	Sat Sep 11 12:33:07 2010
***************
*** 173,179 ****
  1.7
  date	2010.02.19.00.40.04;	author petere;	state Exp;
  branches
! 	1.7.6.1;
  next	1.6;
  
  1.6
--- 173,179 ----
  1.7
  date	2010.02.19.00.40.04;	author petere;	state Exp;
  branches
! 	1.7.6.0;
  next	1.6;
  
  1.6
***************
*** 206,211 ****
--- 206,216 ----
  branches;
  next	;
  
+ 1.7.6.0
+ date	2010.02.19.00.40.04;	author petere;	state dead;
+ branches;
+ next	1.7.6.1;
+ 
  1.7.6.1
  date	2010.05.13.10.50.03;	author petere;	state Exp;
  branches;
***************
*** 3636,3641 ****
--- 3641,3654 ----
  @
  
  
+ 1.7.6.0
+ log
+ @Mark branch as deleted.
+ @
+ text
+ @@
+ 
+ 
  1.7.6.1
  log
  @Translation update
diff -cr repo/pgsql/src/include/utils/typcache.h,v repo.patched/pgsql/src/include/utils/typcache.h,v
*** repo/pgsql/src/include/utils/typcache.h,v	Sat Sep  4 07:18:49 2010
--- repo.patched/pgsql/src/include/utils/typcache.h,v	Sun Sep 12 10:59:10 2010
***************
*** 275,283 ****
  1.1
  date	2003.08.17.19.58.06;	author tgl;	state Exp;
  branches
! 	1.1.2.1;
  next	;
  
  1.1.2.1
  date	2003.09.07.04.37.09;	author momjian;	state Exp;
  branches;
--- 275,288 ----
  1.1
  date	2003.08.17.19.58.06;	author tgl;	state Exp;
  branches
! 	1.1.2.0;
  next	;
  
+ 1.1.2.0
+ date	2003.08.17.19.58.06;	author tgl;	state dead;
+ branches;
+ next	1.1.2.1;
+ 
  1.1.2.1
  date	2003.09.07.04.37.09;	author momjian;	state Exp;
  branches;
***************
*** 914,919 ****
--- 919,932 ----
  @
  
  
+ 1.1.2.0
+ log
+ @Mark branch as deleted.
+ @
+ text
+ @@
+ 
+ 
  1.1.2.1
  log
  @Update this branch to match CVS head, includes WIN32 improvements.
diff -cr repo/pgsql/src/port/unsetenv.c,v repo.patched/pgsql/src/port/unsetenv.c,v
*** repo/pgsql/src/port/unsetenv.c,v	Tue Sep  7 10:10:39 2010
--- repo.patched/pgsql/src/port/unsetenv.c,v	Sat Sep 11 12:39:27 2010
***************
*** 203,210 ****
  1.6
  date	2005.11.22.18.17.34;	author momjian;	state Exp;
  branches
! 	1.6.2.1
! 	1.6.4.1;
  next	1.5;
  
  1.5
--- 203,210 ----
  1.6
  date	2005.11.22.18.17.34;	author momjian;	state Exp;
  branches
! 	1.6.2.0
! 	1.6.4.0;
  next	1.5;
  
  1.5
***************
*** 238,248 ****
--- 238,258 ----
  branches;
  next	;
  
+ 1.6.2.0
+ date	2005.11.22.18.17.34;	author momjian;	state dead;
+ branches;
+ next	1.6.2.1;
+ 
  1.6.2.1
  date	2006.01.05.00.51.25;	author tgl;	state Exp;
  branches;
  next	;
  
+ 1.6.4.0
+ date	2005.11.22.18.17.34;	author momjian;	state dead;
+ branches;
+ next	1.6.4.1;
+ 
  1.6.4.1
  date	2006.01.05.00.51.52;	author tgl;	state Exp;
  branches;
***************
*** 433,438 ****
--- 443,456 ----
  @
  
  
+ 1.6.4.0
+ log
+ @Mark branch as deleted.
+ @
+ text
+ @@
+ 
+ 
  1.6.4.1
  log
  @Add port support for unsetenv() in back branches.  Needed for locale
***************
*** 445,450 ****
--- 463,476 ----
  @
  
  
+ 1.6.2.0
+ log
+ @Mark branch as deleted.
+ @
+ text
+ @@
+ 
+ 
  1.6.2.1
  log
  @Add port support for unsetenv() in back branches.  Needed for locale
diff -cr repo/pgsql/src/test/regress/expected/geometry_2.out,v repo.patched/pgsql/src/test/regress/expected/geometry_2.out,v
*** repo/pgsql/src/test/regress/expected/geometry_2.out,v	Sat Sep  4 07:19:26 2010
--- repo.patched/pgsql/src/test/regress/expected/geometry_2.out,v	Sat Sep 11 15:32:56 2010
***************
*** 198,204 ****
  date	2004.12.02.01.34.17;	author tgl;	state Exp;
  branches
  	1.2.4.1
! 	1.2.6.1;
  next	1.1;
  
  1.1
--- 198,204 ----
  date	2004.12.02.01.34.17;	author tgl;	state Exp;
  branches
  	1.2.4.1
! 	1.2.6.0;
  next	1.1;
  
  1.1
***************
*** 211,216 ****
--- 211,221 ----
  branches;
  next	;
  
+ 1.2.6.0
+ date	2004.12.02.01.34.17;	author tgl;	state dead;
+ branches;
+ next	1.2.6.1;
+ 
  1.2.6.1
  date	2005.07.16.18.39.26;	author tgl;	state Exp;
  branches;
***************
*** 959,964 ****
--- 964,977 ----
  @
  
  
+ 1.2.6.0
+ log
+ @Mark branch as deleted.
+ @
+ text
+ @@
+ 
+ 
  1.2.6.1
  log
  @The geometry_2 variant appears to be needed in 7.4 branch as well as
diff -cr repo/pgsql/src/test/regress/expected/update.out,v repo.patched/pgsql/src/test/regress/expected/update.out,v
*** repo/pgsql/src/test/regress/expected/update.out,v	Sat Sep  4 07:19:26 2010
--- repo.patched/pgsql/src/test/regress/expected/update.out,v	Sun Sep 12 10:58:42 2010
***************
*** 205,213 ****
  1.1
  date	2003.08.26.18.32.23;	author momjian;	state Exp;
  branches
! 	1.1.2.1;
  next	;
  
  1.1.2.1
  date	2003.09.07.04.37.13;	author momjian;	state Exp;
  branches;
--- 205,218 ----
  1.1
  date	2003.08.26.18.32.23;	author momjian;	state Exp;
  branches
! 	1.1.2.0;
  next	;
  
+ 1.1.2.0
+ date	2003.08.26.18.32.23;	author momjian;	state dead;
+ branches;
+ next	1.1.2.1;
+ 
  1.1.2.1
  date	2003.09.07.04.37.13;	author momjian;	state Exp;
  branches;
***************
*** 440,445 ****
--- 445,458 ----
  @
  
  
+ 1.1.2.0
+ log
+ @Mark branch as deleted.
+ @
+ text
+ @@
+ 
+ 
  1.1.2.1
  log
  @Update this branch to match CVS head, includes WIN32 improvements.
diff -cr repo/pgsql/src/test/regress/sql/update.sql,v repo.patched/pgsql/src/test/regress/sql/update.sql,v
*** repo/pgsql/src/test/regress/sql/update.sql,v	Sat Sep  4 07:19:26 2010
--- repo.patched/pgsql/src/test/regress/sql/update.sql,v	Sun Sep 12 11:00:31 2010
***************
*** 205,213 ****
  1.1
  date	2003.08.26.18.32.23;	author momjian;	state Exp;
  branches
! 	1.1.2.1;
  next	;
  
  1.1.2.1
  date	2003.09.07.04.37.13;	author momjian;	state Exp;
  branches;
--- 205,218 ----
  1.1
  date	2003.08.26.18.32.23;	author momjian;	state Exp;
  branches
! 	1.1.2.0;
  next	;
  
+ 1.1.2.0
+ date	2003.08.26.18.32.23;	author momjian;	state dead;
+ branches;
+ next	1.1.2.1;
+ 
  1.1.2.1
  date	2003.09.07.04.37.13;	author momjian;	state Exp;
  branches;
***************
*** 371,376 ****
--- 376,389 ----
  DROP TABLE update_test;@
  
  
+ 1.1.2.0
+ log
+ @Mark branch as deleted.
+ @
+ text
+ @@
+ 
+ 
  1.1.2.1
  log
  @Update this branch to match CVS head, includes WIN32 improvements.
diff -cr repo/pgsql/src/win32/Attic/ipc.patch,v repo.patched/pgsql/src/win32/Attic/ipc.patch,v
*** repo/pgsql/src/win32/Attic/ipc.patch,v	Wed Dec 29 05:28:00 1999
--- repo.patched/pgsql/src/win32/Attic/ipc.patch,v	Sat Sep 11 18:13:36 2010
***************
*** 24,32 ****
  1.1
  date	99.09.24.05.58.48;	author inoue;	state Exp;
  branches
! 	1.1.2.1;
  next	;
  
  1.1.2.1
  date	99.12.29.10.14.46;	author momjian;	state Exp;
  branches;
--- 24,37 ----
  1.1
  date	99.09.24.05.58.48;	author inoue;	state Exp;
  branches
! 	1.1.2.0;
  next	;
  
+ 1.1.2.0
+ date	99.09.24.05.58.48;	author inoue;	state dead;
+ branches;
+ next	1.1.2.1;
+ 
  1.1.2.1
  date	99.12.29.10.14.46;	author momjian;	state Exp;
  branches;
***************
*** 362,367 ****
--- 367,380 ----
  @@
  
  
+ 1.1.2.0
+ log
+ @Mark branch as deleted.
+ @
+ text
+ @@
+ 
+ 
  1.1.2.1
  log
  @Add NT patch.
EOFEOF

chmod u-w pgsql/contrib/cube/expected/cube_1.out,v
chmod u-w pgsql/doc/Attic/FAQ_HPUX,v
chmod u-w pgsql/doc/Attic/FAQ_czeck,v
chmod u-w pgsql/doc/Attic/FAQ_hungarian,v
chmod u-w pgsql/doc/Attic/FAQ_turkish,v
chmod u-w pgsql/doc/src/FAQ/Attic/FAQ_czech.html,v
chmod u-w pgsql/doc/src/FAQ/Attic/FAQ_hungarian.html,v
chmod u-w pgsql/doc/src/FAQ/Attic/FAQ_turkish.html,v
chmod u-w pgsql/src/backend/utils/cache/typcache.c,v
chmod u-w pgsql/src/bin/pg_dump/po/it.po,v
chmod u-w pgsql/src/include/utils/typcache.h,v
chmod u-w pgsql/src/port/unsetenv.c,v
chmod u-w pgsql/src/test/regress/expected/geometry_2.out,v
chmod u-w pgsql/src/test/regress/expected/update.out,v
chmod u-w pgsql/src/test/regress/sql/update.sql,v
chmod u-w pgsql/src/win32/Attic/ipc.patch,v