Home

PostgreSQL 8.4 merge

Resources:

Spreadsheet that lists all the commits between 8.3 and 8.4: https://docs.google.com/spreadsheets/d/1dDDDqV4ysVmDHjzLPjZGO6IMJO5DKldbgIZv8x3uMJQ/edit?usp=sharing

Some advice on dealing with merge confclits: https://github.com/greenplum-db/gpdb/wiki/Merge-Conflict-Zoo

Tips & Tricks

• Here's a little perl script that auto-resolves the most trivial merge conflicts:
• The upstream sources will be consulted regularly: clone a PostgreSQL tree into a directory named 8.4 and check out REL8_4_STABLE, and another one in a 8.3 directory with REL8_3_STABLE. That will make it easy to compare versions of files.
• The XML support in Greenplum was backported from 9.x, for most conflicts involving XML the HEAD hunk will be the right one (with very few exceptions).
• The psql utility has had lots of backports from later versions, tread with care when resolving conflicts