Re: PostgreSQL 8.4 development plan

* Florian Pflug <fgp(dot)phlo(dot)org(at)gmail(dot)com> [080208 09:25]:
> Aidan Van Dyk wrote:
> >The Git repo certainly is an "incremental" update.
> >
> >If you ever see a "rewind" (non-fastforward) of the the repo.or.cz
> >PostgreSQL repo, please let me know...
>
> Hm... interesting...
>
> I'm pretty sure that the "past" changed at least once - at least I once
> got loud complaints from git about being unable to merge because there
> is no common anchestor, or something like that.

Very strange - I don't recall it rewinding ever for me. In fact, I'm
pretty sure it *can't* rewind heads, because I *don't* push with -f.

> I seem the remember that I fixed that manually, and only switched to
> using git-cherry when it happened again - but that memory could be wrong...

Wow, the following scheme seems like an awful workaround for what should
be a simple:

# fetch any remote CVS commits
git fetch # defaults to origin, use whatever remote you prefer

# And now let's try and rebase my changes onto CVS HEAD
git rebase origin/master # again - use whatever remote/branch you want.
<edit and fix conflicts/problems>
git commit && git rebase --continue

> For reference, here is the script I use for fetching changesets ATM
> --------------------------
> #Checkout pgsql-head.
> git-checkout pgsql-head 2>&1 || exit 1
>
> #Pull the latest changesets
> git-fetch pgsql-upstream-git 2>&1 || exit 1
>
> #Now find all unapplied commits from upstream,
> #and commit them
> set -o pipefail
> nice git-cherry \
> pgsql-head \
> pgsql-upstream-git/master \
> pgsql-upstream-git-lastmerged \
> | sed -n 's/^\+ \([A-Fa-f0-9][A-Fa-f0-9]*\)$/\1/p' \
> | xargs -n1 --no-run-if-empty \
> git-cherry-pick \
> 2>&1 \
> || exit 1
>
> #Now, update pgsql-upstream-git-lastmerged
> git tag -f pgsql-upstream-git-lastmerged pgsql-upstream-git/master \
> || exit 1
> --------------------------
>
> regards, Florian Pflug

--
Aidan Van Dyk Create like a god,
aidan(at)highrise(dot)ca command like a king,
http://www.highrise.ca/ work like a slave.