Re: Patchy and dev/staging

[David Kastrup]

Peekay Ex <address@hidden> writes:

> address@hidden:~/Desktop$ python compile_lilypond_test.py
> remote: Counting objects: 5, done.
> remote: Compressing objects: 100% (3/3), done.
> remote: Total 3 (delta 2), reused 0 (delta 0)
> Unpacking objects: 100% (3/3), done.
>>From git://git.sv.gnu.org/lilypond
>    1c8ae9f..dd63de6  master     -> origin/master
> Initialized empty Git repository in /home/jlowe/patchy/src-2011-11-12-12/.git/
> Checking out files: 100% (4375/4375), done.
> Note: checking out 'origin/master'.
>
> ...
>
> HEAD is now at dd63de6... Release: bump version.
> Already up-to-date.
> push merge:
> (do this manually for debugging/testing)
>       git push origin HEAD:master
> address@hidden:~/Desktop$

Looks reasonable.  I just looked through the scripts, and there is one
blunder: autocompile.merge_push does

  def merge_push(self):
        os.chdir(self.git_repository_dir)
        os.system("git push origin HEAD:master")

Unfortunately, self.git_repository_dir has not been touched all that
time (which is more or less the point of the mirroring, so that the
build&test does not disturb your normal work), so pushing its HEAD is
not the right thing to do.

Probably you first need to do
git fetch self.src_dir HEAD:origin/master
in your self.git_repository_dir
and, if that succeeds, _then_ do the push from its origin/master to upstream.

Graham?

-- 
David Kastrup