David,
On Fri, Nov 11, 2011 at 6:38 AM, David Kastrup <d...@gnu.org> wrote:
> Graham Percival <gra...@percival-music.ca> writes:
>
>> On Thu, Nov 10, 2011 at 11:56:30PM +0100, David Kastrup wrote:
>>> Let's take the "David, I tested dev/staging at commit 43214314xxxxxx,
>>> and it's fine" mail scenario.
>>
>> David, I ran Patchy, and it built commit
>> cd229915fc873fdb6fd0125827452cb0ba0067a7 and it's fine.
>>
>> Patchy has printed out the
>> -----
>> push merge:
>> (do this manually for debugging/testing)
>> git push origin HEAD:master
>> -----
>>
>> message, but will let you do the actual pushing if you agree that
>> cd229915fc873fdb6fd0125827452cb0ba0067a7 was the right thing to
>> test.
>
> Yes, this was right to test, and if HEAD at the time Patchy suggested
> pushing it was cd229915fc873fdb6fd0125827452cb0ba0067a7, it would have
> done right. I am pushing it myself presently. We now know that Patchy
> will not do anything imprudent if master has not moved independently.
>
> The next scenario we can test if _only_ master has moved (in which case
> it might be possible to fastforward dev/staging and test it, even though
> pushing the result would be a noop). I have a patch here that is fine
> enough, but have to fend for breakfast soon. Probably back in 1h20.
>
> --
> David Kastrup
>
> _______________________________________________
> lilypond-devel mailing list
> lilypond-devel@gnu.org
> https://lists.gnu.org/mailman/listinfo/lilypond-devel
>
Just now (7:20 BST) Patchy said:
jlowe@jlowe-lilybuntu2:~/Desktop$ python compile_lilypond_test.py
remote: Counting objects: 221, done.
remote: Compressing objects: 100% (24/24), done.
remote: Total 130 (delta 106), reused 129 (delta 106)
Receiving objects: 100% (130/130), 275.95 KiB | 16 KiB/s, done.
Resolving deltas: 100% (106/106), completed with 90 local objects.
>From ssh://git.sv.gnu.org/srv/git/lilypond
10ab28f..cd22991 dev/staging -> origin/dev/staging
0b7ca86..cd22991 master -> origin/master
* [new tag] release/2.15.17-1 -> release/2.15.17-1
Note: checking out 'origin/dev/staging'.
...
HEAD is now at cd22991... Adapt docs to new $ and #{ ... #} behavior
Current branch origin/dev/staging is up to date.
push merge:
(do this manually for debugging/testing)
git push origin HEAD:master
jlowe@jlowe-lilybuntu2:~/Desktop$
--snip--
I've not done any pushing. So do with this information what you will.
--
--
James
_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel
