This repository has been archived by the owner on May 22, 2024. It is now read-only.

Home

Jump to bottom

Daniel Gustafsson edited this page Sep 11, 2017 · 30 revisions

PostgreSQL 8.4 merge

Resources:

Plan on breakdown into iterations: https://groups.google.com/a/greenplum.org/d/msg/gpdb-dev/qlTs4J36Xo4/OhGzrZDhCgAJ

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 conflicts: https://github.com/greenplum-db/gpdb/wiki/Merge-Conflict-Zoo

How to create a merge iteration branch: https://github.com/greenplum-db/gpdb/wiki/Creating-a-merge-iteration-branch

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.

For any questions, please ask at [email protected].