Report: removing the inconsistencies in our CVS->git conversion

Поиск
Список
Период
Сортировка
От Tom Lane
Тема Report: removing the inconsistencies in our CVS->git conversion
Дата
Msg-id 20377.1284346981@sss.pgh.pa.us
обсуждение исходный текст
Ответы Re: Report: removing the inconsistencies in our CVS->git conversion  (Robert Haas <robertmhaas@gmail.com>)
Re: Report: removing the inconsistencies in our CVS->git conversion  (Bruce Momjian <bruce@momjian.us>)
Список pgsql-hackers
I've spent much of the weekend examining the discrepancies between our CVS
repository and the tarballs available from our FTP archives, and after
that trying to remove infelicities in the cvs2git output.  There are a
couple of remaining oddities that I would classify as probable cvs2git
bugs, but an awful lot of it is inconsistencies in the CVS repository
itself, some of which I can explain and some that I can't.  Read on for
many boring details.

One thing that only old-timers will recall is that originally the PG code
base was divided into multiple repositories.  There was one for the server
code and one for the client interfaces, and I believe that at the very
beginning much of the documentation was in yet a third place.  The oldest
stuff that's now in src/interfaces/ was in the client repository.  It
looks to me like when the earliest tarballs were made up, the
subdirectories that were in the client repository were dumped directly
under src/ instead of src/interfaces; that is, the directory layout of
those tarballs does not exactly match the current CVS repository layout.

I also found out that somebody seems to have manually moved the RCS file
for src/backend/commands/version.c into src/backend/commands/_deadcode,
and that a couple of subdirectories apparently were manually renamed
somewhere along the line.

The upshot of all this is that if you want to match the old tarballs to
current CVS contents, you need to make these hacks:

    # hacks to make certain old versions diff successfully
    if ((-d "postgresql-v$tag/src" and
        not -d "postgresql-v$tag/src/interfaces") or
        -d "postgres95/src") {
        print "moving src/interfaces for $tag\n";
        system("mv cvsout/src/interfaces/* cvsout/src") == 0 || die "mv failed: $?";
        system("rmdir cvsout/src/interfaces") == 0 || die "rmdir failed: $?";
    }
    if (-d "postgresql-v$tag/src/pgsql_perl5") {
        print "moving perl5 for $tag\n";
        system("mv cvsout/src/perl5 cvsout/src/pgsql_perl5") == 0 || die "mv failed: $?";
    }
    if (-f "postgresql-$tag/src/backend/commands/version.c" or
        -f "postgresql-v$tag/src/backend/commands/version.c" or
        -f "postgres95/src/backend/commands/version.c") {
        print "moving version.c for $tag\n";
        system("mv cvsout/src/backend/commands/_deadcode/version.c cvsout/src/backend/commands") == 0 || die "mv
failed:$?"; 
        system("rmdir cvsout/src/backend/commands/_deadcode 2>/dev/null");
    }
    if (-d "postgresql-$tag/src/test/locale/ISO8859-7") {
        print "moving ISO8859-7 for $tag\n";
        system("mv cvsout/src/test/locale/gr_GR.ISO8859-7 cvsout/src/test/locale/ISO8859-7") == 0 || die "mv failed:
$?";
    }

Just for the record, these are the versions for which these tests hit:

moving src/interfaces for 1.08
moving version.c for 1.08
moving src/interfaces for 1.09
moving version.c for 1.09
moving src/interfaces for 6.1
moving perl5 for 6.1
moving version.c for 6.1
moving src/interfaces for 6.1.1
moving perl5 for 6.1.1
moving version.c for 6.1.1
moving version.c for 6.2
moving version.c for 6.2.1
moving version.c for 6.3.2
moving ISO8859-7 for 6.5
moving ISO8859-7 for 6.5.1
moving ISO8859-7 for 6.5.2
moving ISO8859-7 for 6.5.3

With those changes, I am able to match all the available archival tarballs
to various places in the CVS history.  The exact spots where they match
are detailed in the attached "matches" file.  The file also shows the
cvsroot path and CVS module name that was in use at each time; you need
to duplicate that if you want $Header$ lines to match what's in the
tarballs.  (I set up symlinks to the base repository on my machine so that
CVS could check out successfully for each of these scenarios.)

There are still a couple of unexplainable discrepancies, though.
In particular, the 1.08 and 1.09 tarballs contain this fix:
http://anoncvs.postgresql.org/cvsweb.cgi/pgsql/src/interfaces/libpgtcl/Attic/pgtclCmds.c.diff?r1=1.10;r2=1.11
which is odd because it wasn't applied to CVS till months after those
tarballs were made.  Even odder, the file timestamp on pgtclCmds.c in
the tarballs agrees with CVS revision 1.2, which is what ought to be in
those tarballs according to CVS.  It may be that this fix was made in the
separate client-code repository and not propagated to the core till later;
but that theory doesn't explain the exact timestamp match.

Anyway, the distressing thing about what the "matches" file shows is that
we do not have CVS tags for a lot of the older tarballs.  Even worse,
there are a couple of CVS tags that look like they ought to match released
tarballs, but do not: the tags were evidently applied a few commits before
the tarball was actually made.  In particular, the tags REL6_5, REL7_1,
and REL7_1_2 don't match the tarballs they ought to.  I don't have a whole
lot of faith in some of the other early tags either, because we don't seem
to have an archived tarball to compare them to.

Having completed that comparison, I then moved on to trying to get rid of
the discrepancies in the git conversion; particularly, trying to get rid
of the "manufactured commits".  I didn't have much success in that for the
cases where the manufactured commit was caused by a back-branch file
addition.  The case I showed before where things cleaned up nicely (for
pg_dump's it.po) depended on the fact that the place where the branch
would naturally sprout off happened to be a "dead" revision on HEAD.
That's not the case anywhere else, so I gave up on the complicated patch
for it.po.  The patches I'm using instead just inject a dead ".0" revision
immediately after the branch point, and are pretty small and easy to
verify.  I only bothered to do this for the cases where the back-branch
addition happened significantly later than the main-branch addition.  If
they were done in a group of related commits with nothing else in between,
I left well enough alone.  We still have "manufactured" commits either
way, but they are just cosmetic so I guess we should live with them.

I also found numerous places where we'd been sloppy about placing tags.
That explains some of the weird things cvs2git did.  In particular:

* We had the already-known problem that gram.c and some other derived
files had commits made after they should have been dead.

* Bruce had transiently added those files on the WIN32_DEV branch as
well, to general disapproval, and this seemed to also give cvs2git
indigestion.  The attached proposed fixup script deals with this by
deleting those revisions altogether.  This is a loss of history, but
not one that I care about.

* The HISTORY and INSTALL files have REL7_3_10 tags and should not.
As mentioned earlier, I think this is because they were deleted after the
original placement of that tag, and weren't correctly fixed when the
tag was moved up to branch end a few days later.

* The regression tests files recently added to contrib/xml2 have REL8_0_23
tags.  I have no idea how that happened, because they certainly didn't
exist when 8.0.23 was released.

* There are a bunch of files that should have REL7_3_5 tags and lack them.
They are in just a few subdirectories, so probably what happened was that
the "cvs tag" operation was issued in an incomplete checkout tree.

* Similarly, gram.c should have a release-6-3 tag and lacks it.

* There are a bunch of files that have REL7_1 tags when what they should
have are REL7_1_BETA tags.  These appear to be exactly the files that were
deleted between the initial placement of the REL7_1 tag and Marc's later
ex-post-facto renaming of the tag to REL7_1_BETA.  I'm guessing another
case of "cvs tag" missing files that weren't in the checkout.

* There are a number of files that lack the REL2_0 tag and REL2_0B branch,
though they should have it according to file dates.  These appear to be
exactly the files that were in the separate documentation repository at
the time, so that probably tells us the mechanism for missing them.

After fixing all the above items using the attached script, I have what
seems to be a reasonably clean conversion.  I still have the three
oddities alluded to over in the "uh-oh" thread, but I'm not sure any of
them should be considered blockers for making the conversion.  There are
also some cosmetic issues remaining, like what committer to blame the
various inserted commits on and whether we want to keep partial tags.
But this message is long enough already so I'll get to those issues
separately.

Attached are an updated version of Max's README file about how to perform
the conversion, the repository fixup script needed for that, the Perl
script I used for comparing CVS to tarballs, and the input file for the
Perl script, which shows which CVS tag or checkout date to compare against
each of the available tarballs.

            regards, tom lane

Overall conversion process
==========================

1. Fetch CVS repository:
   $ rsync -azH --delete anoncvs.postgresql.org::pgsql-cvs cvsroot/
   You MUST install this at /cvsroot, or at least make a symlink
   from there, so that $Header$ keywords will match PG CVS history
   as closely as possible.

2. You need a version of CVS that will honor the $PostgreSQL$ RCS keywords.
   Stock versions of cvs 1.11.x will *not*.  The CVS repository is set up
   for the BSD patch, which honors
    tag=PostgreSQL=CVSHeader
   in /cvsroot/CVSROOT/options.  If you have a recent 1.12.x cvs release,
   you'll need to add this to /cvsroot/CVSROOT/config:
    LocalKeyword=PostgreSQL=CVSHeader
   Test that it is working by checking out a recent release tag and diffing
   against the corresponding release tarball, for example
    cvs -Q -d /cvsroot co -d cvsout -r REL8_4_4 pgsql
    find cvsout -name CVS -type d | xargs rm -rf
    tar xfj postgresql-8.4.4.tar.bz2
    diff -r cvsout postgresql-8.4.4

3. Run the repository.fixups script.

4. Run cvs2git trunk r5270:
    cvs2git --options cvs2git.options

   (cvs2git-example.options is an unmodified copy of the upstream example
   config file at the version cvs2git.options is based on, for comparison.)

5. Convert to a git repository with git fast-import, for example

    mkdir git && cd git && git init .
    cat ../cvs2svn-tmp/git-blob.dat ../cvs2svn-tmp/git-dump.dat | git fast-import
    git reset --hard
    cd ..
    rm -rf cvs2svn-tmp
#!/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
#! /usr/bin/perl -w

while(<>) {
    if (m/^(\S+)\s+(\S+)\s+(\S+)\s+(.+)$/) {
    my $tarball = $1;
    my $cvsroot = $2;
    my $project = $3;
    my $tagopt = $4;
    $tarball =~ m/^\w+-(\S+)\.tar.gz$/;
    my $tag = $1;

    system("cvs -Q -d $cvsroot co -d cvsout $tagopt $project") == 0 || die "cvs failed: $?";
    system("tar xfz ../$tarball") == 0 || die "tar failed: $?";
    system("find cvsout post* -name CVS -type d | xargs rm -rf") == 0 || die "find failed: $?";

    # hacks to make certain old versions diff successfully
    if ((-d "postgresql-v$tag/src" and
        not -d "postgresql-v$tag/src/interfaces") or
        -d "postgres95/src") {
        print "moving src/interfaces for $tag\n";
        system("mv cvsout/src/interfaces/* cvsout/src") == 0 || die "mv failed: $?";
        system("rmdir cvsout/src/interfaces") == 0 || die "rmdir failed: $?";
    }
    if (-d "postgresql-v$tag/src/pgsql_perl5") {
        print "moving perl5 for $tag\n";
        system("mv cvsout/src/perl5 cvsout/src/pgsql_perl5") == 0 || die "mv failed: $?";
    }
    if (-f "postgresql-$tag/src/backend/commands/version.c" or
        -f "postgresql-v$tag/src/backend/commands/version.c" or
        -f "postgres95/src/backend/commands/version.c") {
        print "moving version.c for $tag\n";
        system("mv cvsout/src/backend/commands/_deadcode/version.c cvsout/src/backend/commands") == 0 || die "mv
failed:$?"; 
        system("rmdir cvsout/src/backend/commands/_deadcode 2>/dev/null");
    }
    if (-d "postgresql-$tag/src/test/locale/ISO8859-7") {
        print "moving ISO8859-7 for $tag\n";
        system("mv cvsout/src/test/locale/gr_GR.ISO8859-7 cvsout/src/test/locale/ISO8859-7") == 0 || die "mv failed:
$?";
    }

    system("diff -cr cvsout post* >diffs/diff.$tag");
    system("diff -cr -I '\$PostgreSQL' -I '\$Header' cvsout post* >diffs/diff.$tag.na");
    system("rm -rf cvsout post*") == 0 || die "rm failed: $?";
    }
}
postgres95-1.08.tar.gz        /usr/local/cvsroot    postgres95    -D '1996-10-07 03:00+00' -r Release_1_0_3
postgres95-1.09.tar.gz        /usr/local/cvsroot    postgres95    -D '1996-11-05 08:27+00' -r Release_1_0_3
postgresql-6.1.tar.gz        /usr/local/cvsroot    postgres95    -D '1997-06-13 19:52+00'
postgresql-6.1.1.tar.gz        /usr/local/cvsroot    postgres95    -D '1997-07-21 23:52+00'
postgresql-6.2.tar.gz        /usr/local/cvsroot    pgsql        -D '1997-10-02 19:44+00'
postgresql-6.2.1.tar.gz        /usr/local/cvsroot    pgsql        -D '1997-10-18 20:40+00'
postgresql-6.3.2.tar.gz        /usr/local/cvsroot    pgsql        -D '1998-04-19 07:01+00'
postgresql-6.4.2.tar.gz        /usr/local/cvsroot    pgsql        -D '1999-01-04 03:37+00' -r REL6_4
postgresql-6.5.tar.gz        /usr/local/cvsroot    pgsql        -D '1999-06-15 07:04+00'
postgresql-6.5.1.tar.gz        /usr/local/cvsroot    pgsql        -D '1999-07-20 12:29+00' -r REL6_5_PATCHES
postgresql-6.5.2.tar.gz        /usr/local/cvsroot    pgsql        -D '1999-09-16 00:24+00' -r REL6_5_PATCHES
postgresql-6.5.3.tar.gz        /usr/local/cvsroot    pgsql        -D '1999-11-04 18:24+00' -r REL6_5_PATCHES
postgresql-7.0.tar.gz        /usr/local/cvsroot    pgsql    -r REL7_0
postgresql-7.0.2.tar.gz        /home/projects/pgsql/cvsroot    pgsql        -D '2000-06-05 18:17+00' -r REL7_0_PATCHES
postgresql-7.0.3.tar.gz        /home/projects/pgsql/cvsroot    pgsql        -D '2000-11-12 07:33+00' -r REL7_0_PATCHES
postgresql-7.1.tar.gz        /home/projects/pgsql/cvsroot    pgsql        -D '2001-04-13 21:27+00'
postgresql-7.1.1.tar.gz        /home/projects/pgsql/cvsroot    pgsql        -D '2001-05-05 20:27+00'
postgresql-7.1.2.tar.gz        /home/projects/pgsql/cvsroot    pgsql        -D '2001-05-24 16:38+00' -r REL7_1_STABLE
postgresql-7.1.3.tar.gz        /home/projects/pgsql/cvsroot    pgsql        -D '2001-08-17 17:15+00' -r REL7_1_STABLE
postgresql-7.2.tar.gz        /cvsroot    pgsql    -r REL7_2
postgresql-7.2.1.tar.gz        /cvsroot    pgsql            -D '2002-03-28 19:13+00' -r REL7_2_STABLE
postgresql-7.2.2.tar.gz        /cvsroot    pgsql-server        -D '2002-08-23 03:26+00' -r REL7_2_STABLE
postgresql-7.2.3.tar.gz        /cvsroot    pgsql-server    -r REL7_2_3
postgresql-7.2.4.tar.gz        /cvsroot    pgsql-server    -r REL7_2_4
postgresql-7.2.5.tar.gz        /cvsroot    pgsql-server    -r REL7_2_5
postgresql-7.2.6.tar.gz        /cvsroot    pgsql    -r REL7_2_6
postgresql-7.2.7.tar.gz        /cvsroot    pgsql    -r REL7_2_7
postgresql-7.2.8.tar.gz        /cvsroot    pgsql    -r REL7_2_8
postgresql-7.3.tar.gz        /cvsroot    pgsql-server        -D '2002-11-28 02:29+00' -r REL7_3_STABLE
postgresql-7.3.1.tar.gz        /cvsroot    pgsql-server        -D '2002-12-22 04:39+00' -r REL7_3_STABLE
postgresql-7.3.2.tar.gz        /cvsroot    pgsql-server    -r REL7_3_2
postgresql-7.3.3.tar.gz        /cvsroot    pgsql-server        -D '2003-05-24 21:37+00' -r REL7_3_STABLE
postgresql-7.3.4.tar.gz        /cvsroot    pgsql-server    -r REL7_3_4
postgresql-7.3.5.tar.gz        /cvsroot    pgsql-server    -r REL7_3_5
postgresql-7.3.6.tar.gz        /cvsroot    pgsql-server    -r REL7_3_6
postgresql-7.3.7.tar.gz        /cvsroot    pgsql-server    -r REL7_3_7
postgresql-7.3.8.tar.gz        /cvsroot    pgsql    -r REL7_3_8
postgresql-7.3.9.tar.gz        /cvsroot    pgsql    -r REL7_3_9
postgresql-7.3.10.tar.gz    /cvsroot    pgsql    -r REL7_3_10
postgresql-7.3.11.tar.gz    /cvsroot    pgsql    -r REL7_3_11
postgresql-7.3.12.tar.gz    /cvsroot    pgsql    -r REL7_3_12
postgresql-7.3.13.tar.gz    /cvsroot    pgsql    -r REL7_3_13
postgresql-7.3.14.tar.gz    /cvsroot    pgsql    -r REL7_3_14
postgresql-7.3.15.tar.gz    /cvsroot    pgsql    -r REL7_3_15
postgresql-7.3.16.tar.gz    /cvsroot    pgsql    -r REL7_3_16
postgresql-7.3.17.tar.gz    /cvsroot    pgsql    -r REL7_3_17
postgresql-7.3.18.tar.gz    /cvsroot    pgsql    -r REL7_3_18
postgresql-7.3.19.tar.gz    /cvsroot    pgsql    -r REL7_3_19
postgresql-7.3.20.tar.gz    /cvsroot    pgsql    -r REL7_3_20
postgresql-7.3.21.tar.gz    /cvsroot    pgsql    -r REL7_3_21
postgresql-7.4.tar.gz        /cvsroot    pgsql-server    -r REL7_4
postgresql-7.4.1.tar.gz        /cvsroot    pgsql-server    -r REL7_4_1
postgresql-7.4.2.tar.gz        /cvsroot    pgsql-server    -r REL7_4_2
postgresql-7.4.3.tar.gz        /cvsroot    pgsql-server    -r REL7_4_3
postgresql-7.4.4.tar.gz        /cvsroot    pgsql-server    -r REL7_4_4
postgresql-7.4.5.tar.gz        /cvsroot    pgsql-server    -r REL7_4_5
postgresql-7.4.6.tar.gz        /cvsroot    pgsql    -r REL7_4_6
postgresql-7.4.7.tar.gz        /cvsroot    pgsql    -r REL7_4_7
postgresql-7.4.8.tar.gz        /cvsroot    pgsql    -r REL7_4_8
postgresql-7.4.9.tar.gz        /cvsroot    pgsql    -r REL7_4_9
postgresql-7.4.10.tar.gz    /cvsroot    pgsql    -r REL7_4_10
postgresql-7.4.11.tar.gz    /cvsroot    pgsql    -r REL7_4_11
postgresql-7.4.12.tar.gz    /cvsroot    pgsql    -r REL7_4_12
postgresql-7.4.13.tar.gz    /cvsroot    pgsql    -r REL7_4_13
postgresql-7.4.14.tar.gz    /cvsroot    pgsql    -r REL7_4_14
postgresql-7.4.15.tar.gz    /cvsroot    pgsql    -r REL7_4_15
postgresql-7.4.16.tar.gz    /cvsroot    pgsql    -r REL7_4_16
postgresql-7.4.17.tar.gz    /cvsroot    pgsql    -r REL7_4_17
postgresql-7.4.18.tar.gz    /cvsroot    pgsql    -r REL7_4_18
postgresql-7.4.19.tar.gz    /cvsroot    pgsql    -r REL7_4_19
postgresql-7.4.21.tar.gz    /cvsroot    pgsql    -r REL7_4_21
postgresql-7.4.22.tar.gz    /cvsroot    pgsql    -r REL7_4_22
postgresql-7.4.23.tar.gz    /cvsroot    pgsql    -r REL7_4_23
postgresql-7.4.24.tar.gz    /cvsroot    pgsql    -r REL7_4_24
postgresql-7.4.25.tar.gz    /cvsroot    pgsql    -r REL7_4_25
postgresql-7.4.26.tar.gz    /cvsroot    pgsql    -r REL7_4_26
postgresql-7.4.27.tar.gz    /cvsroot    pgsql    -r REL7_4_27
postgresql-7.4.28.tar.gz    /cvsroot    pgsql    -r REL7_4_28
postgresql-7.4.29.tar.gz    /cvsroot    pgsql    -r REL7_4_29
postgresql-8.0.0.tar.gz        /cvsroot    pgsql    -r REL8_0_0
postgresql-8.0.1.tar.gz        /cvsroot    pgsql    -r REL8_0_1
postgresql-8.0.2.tar.gz        /cvsroot    pgsql    -r REL8_0_2
postgresql-8.0.3.tar.gz        /cvsroot    pgsql    -r REL8_0_3
postgresql-8.0.4.tar.gz        /cvsroot    pgsql    -r REL8_0_4
postgresql-8.0.5.tar.gz        /cvsroot    pgsql    -r REL8_0_5
postgresql-8.0.6.tar.gz        /cvsroot    pgsql    -r REL8_0_6
postgresql-8.0.7.tar.gz        /cvsroot    pgsql    -r REL8_0_7
postgresql-8.0.8.tar.gz        /cvsroot    pgsql    -r REL8_0_8
postgresql-8.0.9.tar.gz        /cvsroot    pgsql    -r REL8_0_9
postgresql-8.0.10.tar.gz    /cvsroot    pgsql    -r REL8_0_10
postgresql-8.0.11.tar.gz    /cvsroot    pgsql    -r REL8_0_11
postgresql-8.0.12.tar.gz    /cvsroot    pgsql    -r REL8_0_12
postgresql-8.0.13.tar.gz    /cvsroot    pgsql    -r REL8_0_13
postgresql-8.0.14.tar.gz    /cvsroot    pgsql    -r REL8_0_14
postgresql-8.0.15.tar.gz    /cvsroot    pgsql    -r REL8_0_15
postgresql-8.0.17.tar.gz    /cvsroot    pgsql    -r REL8_0_17
postgresql-8.0.18.tar.gz    /cvsroot    pgsql    -r REL8_0_18
postgresql-8.0.19.tar.gz    /cvsroot    pgsql    -r REL8_0_19
postgresql-8.0.20.tar.gz    /cvsroot    pgsql    -r REL8_0_20
postgresql-8.0.21.tar.gz    /cvsroot    pgsql    -r REL8_0_21
postgresql-8.0.22.tar.gz    /cvsroot    pgsql    -r REL8_0_22
postgresql-8.0.23.tar.gz    /cvsroot    pgsql    -r REL8_0_23
postgresql-8.0.24.tar.gz    /cvsroot    pgsql    -r REL8_0_24
postgresql-8.0.25.tar.gz    /cvsroot    pgsql    -r REL8_0_25
postgresql-8.1.0.tar.gz        /cvsroot    pgsql    -r REL8_1_0
postgresql-8.1.1.tar.gz        /cvsroot    pgsql    -r REL8_1_1
postgresql-8.1.2.tar.gz        /cvsroot    pgsql    -r REL8_1_2
postgresql-8.1.3.tar.gz        /cvsroot    pgsql    -r REL8_1_3
postgresql-8.1.4.tar.gz        /cvsroot    pgsql    -r REL8_1_4
postgresql-8.1.5.tar.gz        /cvsroot    pgsql    -r REL8_1_5
postgresql-8.1.6.tar.gz        /cvsroot    pgsql    -r REL8_1_6
postgresql-8.1.7.tar.gz        /cvsroot    pgsql    -r REL8_1_7
postgresql-8.1.8.tar.gz        /cvsroot    pgsql    -r REL8_1_8
postgresql-8.1.9.tar.gz        /cvsroot    pgsql    -r REL8_1_9
postgresql-8.1.10.tar.gz    /cvsroot    pgsql    -r REL8_1_10
postgresql-8.1.11.tar.gz    /cvsroot    pgsql    -r REL8_1_11
postgresql-8.1.13.tar.gz    /cvsroot    pgsql    -r REL8_1_13
postgresql-8.1.14.tar.gz    /cvsroot    pgsql    -r REL8_1_14
postgresql-8.1.15.tar.gz    /cvsroot    pgsql    -r REL8_1_15
postgresql-8.1.16.tar.gz    /cvsroot    pgsql    -r REL8_1_16
postgresql-8.1.17.tar.gz    /cvsroot    pgsql    -r REL8_1_17
postgresql-8.1.18.tar.gz    /cvsroot    pgsql    -r REL8_1_18
postgresql-8.1.19.tar.gz    /cvsroot    pgsql    -r REL8_1_19
postgresql-8.1.20.tar.gz    /cvsroot    pgsql    -r REL8_1_20
postgresql-8.1.21.tar.gz    /cvsroot    pgsql    -r REL8_1_21
postgresql-8.2.0.tar.gz        /cvsroot    pgsql    -r REL8_2_0
postgresql-8.2.1.tar.gz        /cvsroot    pgsql    -r REL8_2_1
postgresql-8.2.2.tar.gz        /cvsroot    pgsql    -r REL8_2_2
postgresql-8.2.3.tar.gz        /cvsroot    pgsql    -r REL8_2_3
postgresql-8.2.4.tar.gz        /cvsroot    pgsql    -r REL8_2_4
postgresql-8.2.5.tar.gz        /cvsroot    pgsql    -r REL8_2_5
postgresql-8.2.6.tar.gz        /cvsroot    pgsql    -r REL8_2_6
postgresql-8.2.7.tar.gz        /cvsroot    pgsql    -r REL8_2_7
postgresql-8.2.9.tar.gz        /cvsroot    pgsql    -r REL8_2_9
postgresql-8.2.10.tar.gz    /cvsroot    pgsql    -r REL8_2_10
postgresql-8.2.11.tar.gz    /cvsroot    pgsql    -r REL8_2_11
postgresql-8.2.12.tar.gz    /cvsroot    pgsql    -r REL8_2_12
postgresql-8.2.13.tar.gz    /cvsroot    pgsql    -r REL8_2_13
postgresql-8.2.14.tar.gz    /cvsroot    pgsql    -r REL8_2_14
postgresql-8.2.15.tar.gz    /cvsroot    pgsql    -r REL8_2_15
postgresql-8.2.16.tar.gz    /cvsroot    pgsql    -r REL8_2_16
postgresql-8.2.17.tar.gz    /cvsroot    pgsql    -r REL8_2_17
postgresql-8.3.0.tar.gz        /cvsroot    pgsql    -r REL8_3_0
postgresql-8.3.1.tar.gz        /cvsroot    pgsql    -r REL8_3_1
postgresql-8.3.3.tar.gz        /cvsroot    pgsql    -r REL8_3_3
postgresql-8.3.4.tar.gz        /cvsroot    pgsql    -r REL8_3_4
postgresql-8.3.5.tar.gz        /cvsroot    pgsql    -r REL8_3_5
postgresql-8.3.6.tar.gz        /cvsroot    pgsql    -r REL8_3_6
postgresql-8.3.7.tar.gz        /cvsroot    pgsql    -r REL8_3_7
postgresql-8.3.8.tar.gz        /cvsroot    pgsql    -r REL8_3_8
postgresql-8.3.9.tar.gz        /cvsroot    pgsql    -r REL8_3_9
postgresql-8.3.10.tar.gz    /cvsroot    pgsql    -r REL8_3_10
postgresql-8.3.11.tar.gz    /cvsroot    pgsql    -r REL8_3_11
postgresql-8.4.0.tar.gz        /cvsroot    pgsql    -r REL8_4_0
postgresql-8.4.1.tar.gz        /cvsroot    pgsql    -r REL8_4_1
postgresql-8.4.2.tar.gz        /cvsroot    pgsql    -r REL8_4_2
postgresql-8.4.3.tar.gz        /cvsroot    pgsql    -r REL8_4_3
postgresql-8.4.4.tar.gz        /cvsroot    pgsql    -r REL8_4_4
postgresql-9.1alpha1.tar.gz    /cvsroot    pgsql    -r REL9_1_ALPHA1
postgresql-9.0rc1.tar.gz    /cvsroot    pgsql    -r REL9_0_RC1

В списке pgsql-hackers по дате отправления:

Предыдущее
От: Robert Haas
Дата:
Сообщение: Re: update on global temporary and unlogged tables
Следующее
От: Fujii Masao
Дата:
Сообщение: Re: Walsender doesn't process options passed in the startup packet