How the iteration_REL9_5 branch was created

# merge to 9.6devel branching point
git merge -Xpatience ab93f90cd3a4fcdd891cee9478941c3cc65795b8

# this one is for adding merge conflicts for iteration fixing
git status | grep -n "both modified" | awk -F ":" '{print $3}' | xargs git add

# timezone is synchronized with postgres HEAD
git rm src/timezone/data/africa
git rm src/timezone/data/antarctica
git rm src/timezone/data/asia
git rm src/timezone/data/australasia
git rm src/timezone/data/backward
git rm src/timezone/data/etcetera
git rm src/timezone/data/europe
git rm src/timezone/data/factory
git rm src/timezone/data/iso3166.tab
git rm src/timezone/data/leapseconds
git rm src/timezone/data/northamerica
git rm src/timezone/data/pacificnew
git rm src/timezone/data/southamerica
git rm src/timezone/data/systemv
git rm src/timezone/data/yearistype.sh
git rm src/timezone/data/zone.tab
git rm -f src/timezone/data/backzone
git rm -f src/timezone/data/zone1970.tab

# renamed to dummy_seclabel.sql
# [postgres] git show df761e3cf79db09d602610ee61e51cb378288382
# [postgres] git show da34731bd3c805ab77d6e5914d02b1f011e9479d
git rm src/test/regress/input/security_label.source
git rm src/test/regress/output/security_label.source

# don't care bout these docs
git rm doc/src/sgml/bki.sgml
git rm doc/src/sgml/btree-gin.sgml
git rm doc/src/sgml/filelist.sgml
git rm doc/src/sgml/gist.sgml
git rm doc/src/sgml/indices.sgml
git rm doc/src/sgml/pgtrgm.sgml
git rm doc/src/sgml/postgres.sgml
git rm doc/src/sgml/reference.sgml
git rm doc/src/sgml/sql.sgml
git rm doc/src/sgml/xtypes.sgml

 # delete because wiki says so
git rm src/include/optimizer/geqo.h
git rm src/include/optimizer/geqo_copy.h
git rm src/include/optimizer/geqo_gene.h
git rm src/include/optimizer/geqo_misc.h
git rm src/include/optimizer/geqo_mutation.h
git rm src/include/optimizer/geqo_pool.h
git rm src/include/optimizer/geqo_random.h
git rm src/include/optimizer/geqo_recombination.h
git rm src/include/optimizer/geqo_selection.h
git rm src/backend/optimizer/geqo/geqo_copy.c
git rm src/backend/optimizer/geqo/geqo_erx.c
git rm src/backend/optimizer/geqo/geqo_eval.c
git rm src/backend/optimizer/geqo/geqo_main.c
git rm src/backend/optimizer/geqo/geqo_misc.c
git rm src/backend/optimizer/geqo/geqo_pool.c
git rm src/backend/optimizer/geqo/geqo_random.c
git rm src/backend/optimizer/geqo/geqo_selection.c

# [postgres] git show c619c2351f7ec429b6ddce519c939f7b8465d711
# [postgres] git show 4f700bcd20c087f60346cb8aefd0e269be8e2157
git rm src/include/utils/pg_crc_tables.h

# fix during iteration
git add src/bin/pg_rewind/.gitignore
git add src/bin/pg_rewind/Makefile
git add src/bin/pg_rewind/RewindTest.pm
git add src/bin/pg_rewind/copy_fetch.c
git add src/bin/pg_rewind/datapagemap.h
git add src/bin/pg_rewind/fetch.h
git add src/bin/pg_rewind/file_ops.c
git add src/bin/pg_rewind/file_ops.h
git add src/bin/pg_rewind/filemap.c
git add src/bin/pg_rewind/filemap.h
git add src/bin/pg_rewind/libpq_fetch.c
git add src/bin/pg_rewind/logging.c
git add src/bin/pg_rewind/nls.mk
git add src/bin/pg_rewind/parsexlog.c
git add src/bin/pg_rewind/pg_rewind.c
git add src/bin/pg_rewind/pg_rewind.h
git add src/bin/pg_rewind/po/de.po
git add src/bin/pg_rewind/t/001_basic.pl
git add src/bin/pg_rewind/t/002_databases.pl
git add src/bin/pg_rewind/t/003_extrafiles.pl
git add src/bin/pg_rewind/timeline.c


# [GPDB] git show a5899158e48abe4013797ac9a2eb32f39e06c214
# src/test/ssl is synced with postgres 9.6 STABLE
git checkout --ours src/test/ssl/Makefile
git checkout --ours src/test/ssl/README
git checkout --ours src/test/ssl/ServerSetup.pm
git checkout --ours src/test/ssl/cas.config
git checkout --ours src/test/ssl/root_ca.config
git checkout --ours src/test/ssl/server-cn-only.config
git checkout --ours src/test/ssl/server-no-names.config
git checkout --ours src/test/ssl/server-revoked.config
git checkout --ours src/test/ssl/ssl/.gitignore
git checkout --ours src/test/ssl/ssl/both-cas-1.crt
git checkout --ours src/test/ssl/ssl/both-cas-2.crt
git checkout --ours src/test/ssl/ssl/client-revoked.crt
git checkout --ours src/test/ssl/ssl/client-revoked.key
git checkout --ours src/test/ssl/ssl/client.crl
git checkout --ours src/test/ssl/ssl/client.crt
git checkout --ours src/test/ssl/ssl/client.key
git checkout --ours src/test/ssl/ssl/client_ca.crt
git checkout --ours src/test/ssl/ssl/client_ca.key
git checkout --ours src/test/ssl/ssl/root+client.crl
git checkout --ours src/test/ssl/ssl/root+client_ca.crt
git checkout --ours src/test/ssl/ssl/root+server.crl
git checkout --ours src/test/ssl/ssl/root+server_ca.crt
git checkout --ours src/test/ssl/ssl/root.crl
git checkout --ours src/test/ssl/ssl/root_ca.crt
git checkout --ours src/test/ssl/ssl/root_ca.key
git checkout --ours src/test/ssl/ssl/server-cn-and-alt-names.crt
git checkout --ours src/test/ssl/ssl/server-cn-and-alt-names.key
git checkout --ours src/test/ssl/ssl/server-cn-only.crt
git checkout --ours src/test/ssl/ssl/server-cn-only.key
git checkout --ours src/test/ssl/ssl/server-multiple-alt-names.crt
git checkout --ours src/test/ssl/ssl/server-multiple-alt-names.key
git checkout --ours src/test/ssl/ssl/server-no-names.crt
git checkout --ours src/test/ssl/ssl/server-no-names.key
git checkout --ours src/test/ssl/ssl/server-revoked.crt
git checkout --ours src/test/ssl/ssl/server-revoked.key
git checkout --ours src/test/ssl/ssl/server-single-alt-name.crt
git checkout --ours src/test/ssl/ssl/server-single-alt-name.key
git checkout --ours src/test/ssl/ssl/server-ss.crt
git checkout --ours src/test/ssl/ssl/server-ss.key
git checkout --ours src/test/ssl/ssl/server.crl
git checkout --ours src/test/ssl/ssl/server_ca.crt
git checkout --ours src/test/ssl/ssl/server_ca.key
git checkout --ours src/test/ssl/t/001_ssltests.pl
git add src/test/ssl/Makefile
git add src/test/ssl/README
git add src/test/ssl/ServerSetup.pm
git add src/test/ssl/cas.config
git add src/test/ssl/root_ca.config
git add src/test/ssl/server-cn-only.config
git add src/test/ssl/server-no-names.config
git add src/test/ssl/server-revoked.config
git add src/test/ssl/ssl/.gitignore
git add src/test/ssl/ssl/both-cas-1.crt
git add src/test/ssl/ssl/both-cas-2.crt
git add src/test/ssl/ssl/client-revoked.crt
git add src/test/ssl/ssl/client-revoked.key
git add src/test/ssl/ssl/client.crl
git add src/test/ssl/ssl/client.crt
git add src/test/ssl/ssl/client.key
git add src/test/ssl/ssl/client_ca.crt
git add src/test/ssl/ssl/client_ca.key
git add src/test/ssl/ssl/root+client.crl
git add src/test/ssl/ssl/root+client_ca.crt
git add src/test/ssl/ssl/root+server.crl
git add src/test/ssl/ssl/root+server_ca.crt
git add src/test/ssl/ssl/root.crl
git add src/test/ssl/ssl/root_ca.crt
git add src/test/ssl/ssl/root_ca.key
git add src/test/ssl/ssl/server-cn-and-alt-names.crt
git add src/test/ssl/ssl/server-cn-and-alt-names.key
git add src/test/ssl/ssl/server-cn-only.crt
git add src/test/ssl/ssl/server-cn-only.key
git add src/test/ssl/ssl/server-multiple-alt-names.crt
git add src/test/ssl/ssl/server-multiple-alt-names.key
git add src/test/ssl/ssl/server-no-names.crt
git add src/test/ssl/ssl/server-no-names.key
git add src/test/ssl/ssl/server-revoked.crt
git add src/test/ssl/ssl/server-revoked.key
git add src/test/ssl/ssl/server-single-alt-name.crt
git add src/test/ssl/ssl/server-single-alt-name.key
git add src/test/ssl/ssl/server-ss.crt
git add src/test/ssl/ssl/server-ss.key
git add src/test/ssl/ssl/server.crl
git add src/test/ssl/ssl/server_ca.crt
git add src/test/ssl/ssl/server_ca.key
git add src/test/ssl/t/001_ssltests.pl

# [postgres] git show 81134af3ec09d67043833f8d614fd688f17cb213
git rm contrib/pgbench/Makefile

# [postgres] git show ee3bec5e22f7aed4d9086bec45a8d1821a9e236c
git rm src/bin/pg_basebackup/po/cs.po

# [postgres] git show 8d3e0906df5496b853cc763f87b9ffd2ae27adbe
git rm src/backend/utils/mb/Unicode/ISO10646-GB18030.TXT

# [postgres] git show a6d488cb538c8761658f0f7edfc40cecc8c29f2d
git rm src/template/osf

# All source is in gpdb master, but why was Makefile not added back?
git rm contrib/earthdistance/Makefile
git rm contrib/ltree/Makefile
git rm contrib/tablefunc/Makefile

# Gpdb master already at 9.4 STABLE
# [postgres] git show b6363772fd5f07dcfff2b4869765705ac9633950
git rm  src/test/regress/expected/jsonb_1.out

# git says both added: [postgres] git show f8948616c9403effb84ed09c244650d9750243a2
git add src/backend/po/id.po

# git says both added: resolve whitespace diffs perl script will fix it
git add src/include/common/string.h
git add src/port/mkdtemp.c

# git says both added
git add src/test/modules/Makefile

# git says both added, these are from 9.4 STABLE
# [postgres] git show bfb69b1e5d97dae636370b713993465cfacddd34
git checkout --ours contrib/test_decoding/expected/decoding_into_rel.out
git add contrib/test_decoding/expected/decoding_into_rel.out
git checkout --ours contrib/test_decoding/sql/decoding_into_rel.sql
git add contrib/test_decoding/sql/decoding_into_rel.sql
# [postgres] git show 79abd23db1e9c767ef2b60f6d1a50b2f9d778bf0
git checkout --ours contrib/test_decoding/expected/ondisk_startup.out
git add contrib/test_decoding/expected/ondisk_startup.out
git checkout --ours contrib/test_decoding/specs/ondisk_startup.spec
git add contrib/test_decoding/specs/ondisk_startup.spec

# [GPDB] git show 644b2a9d0bd86ba5c67cf2efb4a8408f30fb137a
# git says both added is the gpdb one up to date enough since it was backported from 9.1 STABLE?
git add src/pl/plperl/expected/plperl_elog_1.out

# git says both added, take theirs to update the merge tree so we don't have to do this again.
git checkout --theirs src/test/isolation/specs/nowait-2.spec
git checkout --theirs src/test/isolation/specs/nowait-3.spec
git checkout --theirs src/test/isolation/specs/nowait-4.spec
git add src/test/isolation/specs/nowait-2.spec
git add src/test/isolation/specs/nowait-3.spec
git add src/test/isolation/specs/nowait-4.spec

# git says both added, take what was done in 9.4 merge iteration
# greenplum has more restrictions unique indexes than postgres
git checkout --ours src/test/regress/expected/equivclass.out
git add src/test/regress/expected/equivclass.out
git checkout --ours src/test/regress/sql/equivclass.sql
git add src/test/regress/sql/equivclass.sql

# git says both added, from atomics work from Robert Mu and Roman Shaposhnik in early greenplum 5
# [postgres] git show c0d7342f1650b6fdefc865c6da33e1f092778af0
# [gpdb]     git show 94eacb66bdf
git checkout --ours src/include/port/atomics.h
git add src/include/port/atomics.h
# [gpdb]     git show 94eacb66bdf
# [gpdb]     git show ad1bcf29393
git checkout --ours src/include/port/atomics/arch-arm.h
git add src/include/port/atomics/arch-arm.h
# [gpdb]     git show 94eacb66bdf
git checkout --ours src/include/port/atomics/generic-xlc.h
git add src/include/port/atomics/generic-xlc.h

# [postgres] git show b0a738f428ca4e52695c0f019c1560c64cc59aef
git rm contrib/pg_xlogdump/Makefile

# [postgres] git show 9fa8b0ee90c44c0f97d16bf65e94322988c94864
git rm contrib/pg_upgrade/.gitignore
git rm contrib/pg_upgrade/Makefile
git rm contrib/pg_upgrade/dump.c

# [postgres] git show 9fa8b0ee90c44c0f97d16bf65e94322988c94864
# they didn't move it, instead they literally deleted it. Do we need it back?
git rm contrib/pg_upgrade/version_old_8_3.c