Re: Patchy and dev/staging

[Peekay Ex]

Hello,

On Sat, Nov 12, 2011 at 12:26 PM, David Kastrup <address@hidden> wrote:
> Graham Percival <address@hidden> writes:
>
>> On Fri, Nov 11, 2011 at 04:35:29PM +0100, David Kastrup wrote:
>>
>> If James uses patch from lilypond-extra
>>   e52f265dd585050fe74250fd291d85886b7f653f
>> then AFAIK patchy is "stupid enough".  It's doing
>>   git clone --mirror -s %s .git
>>   git --git-dir=.git config core.bare false
>>   git checkout origin/master
>>   git merge --ff-only origin/dev/staging
>>
>> and then testing the result.  If it fails at any step (be it a git
>> command, autogen.sh, configure, make, make test, or make doc) then
>> it bails.
>
> Well, now we are in the lucky situation of being able to test how patchy
> fares when somebody has committed to master bypassing dev/staging (since
> it looks like Ian did that with
>
>    commit 1c8ae9fb4170bb2566c2acb1a11155c23c12cfdc
>    Author: Ian Hulin <address@hidden>
>    Date:   Tue Nov 8 12:29:23 2011 +0000
>
>        Tracker 2025 - move safe utility to separate module to aid Guile V2 
> migratio
>
>        lily.scm (define safe-objects) and (define-macro define-safe-public)
>         moved to new scm/safe-utility-defs.scm
>        new file scm/safe-utility-defs.scm
>        All other scm files using define-safe-public now have
>         (use-modules (scm safe-utility-defs)) call added.
>          scm/chord-entry.scm
>          scm/define-music-types.scm
>          scm/lily-library.scm
>          scm/music-functions.scm
>          scm/paper.scm
>
> At the current point of time, patchy should take master, _stay_ with it
> and test it without bombing out, then suggesting to push to master
> (which is somewhat pointless since that would be a noop, and we should
> rather fastforward dev/staging, but one thing after the other).
>
> --

OK I'll set up and run the scripts now and see what happens. I am not
at home but using a slower (only 6CPUs and 8GB of RAM and SAS disks)
server so it takes about 50% longer, so I should know within the hour.
I wont push anything.

Regards

-- 
--
James