[Buildbot-devel] override revision being checked out

[Dustin J. Mitchell]

Your original premise is a little odd - to do a merge in one repo and
then clone from that one.  There's no need for two repositories to do
a merge.  So you're sort of in uncharted territory :)

Codebases could *almost* be convinced to do this, except that it
doesn't really work well with local repositories, which is what you're
using.

I'd recommend using the Git step to check out the revision that
triggered the build, and then solving the rest with shell commands.
I'd also recommend doing it all in one git repo.  That may be as
simple as creating a new branch representing the desired merge target
(using 'git fetch' and 'git checkout -b'), then running 'git merge
HEAD@{1}' to merge the branch that the Git step checked out for you.

Dustin