Re: Staging/Master Merge - James' Patchy

[Phil Holmes]

----- Original Message ----- 
From: "James" <address@hidden>
To: "Phil Holmes" <address@hidden>
Cc: <address@hidden>
Sent: Sunday, April 08, 2012 6:19 PM
Subject: Re: Staging/Master Merge - James' Patchy


Hello,

On 8 April 2012 18:11, Phil Holmes <address@hidden> wrote:
> <address@hidden> wrote in message
> news:address@hidden
> > Begin LilyPond compile, commit: eebdf598862812edf142f1c52a727c962bf26465
> >
> >
> > Merged staging, now at: e045a8a796ea14ac04838af850e89da3a9343bb0
> >
> > Success: ./autogen.sh --noconfigure
> >
> > Success: ../configure --disable-optimising
> >
> > Success: nice make clean -j6 CPU_COUNT=6
> >
> > *** FAILED BUILD ***
> >
> > nice make -j6 CPU_COUNT=6
> >
> > Previous good commit: 18cc52e04834f7eaec4d41cf2783767b0e764d03
> >
> > Current broken commit: e045a8a796ea14ac04838af850e89da3a9343bb0
> >
> > Begin LilyPond compile, commit: 1b473723a8acf07a58f44561068fed212e5bcd98
> >
> > Merged staging, now at: e045a8a796ea14ac04838af850e89da3a9343bb0
> >
> > Success: ./autogen.sh --noconfigure
> >
> > Success: ../configure --disable-optimising
> >
> > Success: nice make clean -j6 CPU_COUNT=6
> >
> > *** FAILED BUILD ***
> >
> > nice make -j6 CPU_COUNT=6
> >
> > Previous good commit:
> >
> > Current broken commit: e045a8a796ea14ac04838af850e89da3a9343bb0
>
>
>
> This is my LSR update. It was OK on my machine, but I'll run patchy myself
> and see what's going on.

Thanks. I have been poking about with my Patchy VM today and thought
my lilypond-git was mucked up, so I ran it again to check

James

PS. Moving over to KVM from VirtualBox using a .raw image alone I can
shave on average about 4 minutes off of my compile times - w00t! :)
which is a significant improvement when you consider it used to take
20-25 minutes for patchy to run from start to finish now I can nearly
break the 15 minute barrier...need to see if I can squeeze any more
out my dell with the PVirt drivers.


=======================================================

OK.  I know why the patch is broken - it doesn't contain the new snippets 
(like screech-and-boink.ly).  This appears to have been a mistake when I was 
creating the huge patch - I had six patches to apply to get the new one, and 
I assume I either missed one, or the files weren't added because I didn't 
run git add after git apply.  Anyway, I assume this one should be reverted, 
which I would do if I knew how.  Could someone either revert it, or tell me 
how and I'll push a new one with the missing files.

--
Phil Holmes