On 7 mai 2012, at 19:17, lilypond.patchy.jl...@gmail.com wrote:
Begin LilyPond compile, commit: 9f408c3d2cfe0e3bbe0a683ff52422bd784459b8
*** FAILED STEP ***
merge from staging
maybe somebody pushed a commit directly to master?
Crap that might have been me with
Hello,
On 7 May 2012 18:21, m...@mikesolomon.org m...@mikesolomon.org wrote:
On 7 mai 2012, at 19:17, lilypond.patchy.jl...@gmail.com wrote:
Begin LilyPond compile, commit: 9f408c3d2cfe0e3bbe0a683ff52422bd784459b8
*** FAILED STEP ***
merge from staging
maybe somebody pushed a
Hello
On 7 May 2012 18:55, m...@mikesolomon.org m...@mikesolomon.org wrote:
On 7 mai 2012, at 19:54, James wrote:
Hello,
On 7 May 2012 18:21, m...@mikesolomon.org m...@mikesolomon.org wrote:
On 7 mai 2012, at 19:17, lilypond.patchy.jl...@gmail.com wrote:
Begin LilyPond compile, commit:
lilypond.patchy.jl...@gmail.com writes:
Begin LilyPond compile, commit: bf2c7f09ff00e6c59877eff5ba5f880299ed95bf
Success:./autogen.sh --noconfigure
Success:../configure --disable-optimising
Success:nice make clean -j7
lilypond.patchy.jl...@gmail.com writes:
Begin LilyPond compile, commit: f1defa51a982cf769172cfcdd6b2612608ba2746
*** FAILED STEP ***
merge from staging
maybe somebody pushed a commit directly to master?
Begin LilyPond compile, commit:
David Kastrup d...@gnu.org writes:
Phil Holmes m...@philholmes.net writes:
If I could have worked out how to split them, while at the same time
being able to keep track of what changes were still needed, I would
have done. However, doing things like having a screech-boink.ly in
new, with a
- Original Message -
From: David Kastrup d...@gnu.org
To: lilypond-devel@gnu.org
Sent: Wednesday, April 11, 2012 10:46 AM
Subject: Re: Staging/Master Merge - James' Patchy
David Kastrup d...@gnu.org writes:
Phil Holmes m...@philholmes.net writes:
If I could have worked out how
On Wed, Apr 11, 2012 at 12:50:16PM +0200, David Kastrup wrote:
My comment relates to the need to git add as a separate step.
You _only_ need to use git add if you made your changes _manually_ in
the work directory instead of going through git.
I had to read David's email a few times, and
- Original Message -
From: David Kastrup d...@gnu.org
To: Phil Holmes m...@philholmes.net
Cc: lilypond-devel@gnu.org
Sent: Wednesday, April 11, 2012 11:50 AM
Subject: Re: Staging/Master Merge - James' Patchy
Phil Holmes m...@philholmes.net writes:
From: David Kastrup d...@gnu.org
Graham Percival gra...@percival-music.ca writes:
On Wed, Apr 11, 2012 at 12:50:16PM +0200, David Kastrup wrote:
My comment relates to the need to git add as a separate step.
You _only_ need to use git add if you made your changes _manually_ in
the work directory instead of going through
Phil Holmes m...@philholmes.net writes:
No way to sort the patches in a manner where they work out at every
step?
It may well have been, but it would have taken far more effort than
compressing them into a single commit. At that point, my brain was
already hurting.
_Please_ check out git
- Original Message -
From: David Kastrup d...@gnu.org
To: Graham Percival gra...@percival-music.ca
Cc: Phil Holmes m...@philholmes.net; lilypond-devel@gnu.org
Sent: Wednesday, April 11, 2012 1:12 PM
Subject: Re: Staging/Master Merge - James' Patchy
Did I mention git rebase -i already
Phil Holmes m...@philholmes.net writes:
I'm sure branches would be more efficient and more git-like, but last
time I tried multiple branches, I forgot what state each was in. With
patches I can open them in an editor and look at them.
git log -p some_branch_name
And I am aware of gitk, but
Phil Holmes m...@philholmes.net writes:
If I could have worked out how to split them, while at the same time
being able to keep track of what changes were still needed, I would
have done. However, doing things like having a screech-boink.ly in
new, with a screech-and-boink.ly in snippets, and
- Original Message -
From: David Kastrup d...@gnu.org
To: lilypond-devel@gnu.org
We use the staging branch exactly to avoid having to revert stuff.
Instead we reset staging. Only stuff that percolated to master needs to
get reverted in order to remove it.
--
David Kastrup
What's
Phil Holmes m...@philholmes.net writes:
- Original Message -
From: David Kastrup d...@gnu.org
To: lilypond-devel@gnu.org
We use the staging branch exactly to avoid having to revert stuff.
Instead we reset staging. Only stuff that percolated to master needs to
get reverted in
lilypond.patchy.jl...@gmail.com wrote in
message news:4f81c580.c507b40a.6878.7...@mx.google.com...
Begin LilyPond compile, commit: eebdf598862812edf142f1c52a727c962bf26465
Merged staging, now at: e045a8a796ea14ac04838af850e89da3a9343bb0
Success: ./autogen.sh --noconfigure
Success:
Hello,
On 8 April 2012 18:11, Phil Holmes m...@philholmes.net wrote:
lilypond.patchy.jl...@gmail.com wrote in message
news:4f81c580.c507b40a.6878.7...@mx.google.com...
Begin LilyPond compile, commit: eebdf598862812edf142f1c52a727c962bf26465
Merged staging, now at:
James pkx1...@gmail.com writes:
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
- Original Message -
From: James pkx1...@gmail.com
To: Phil Holmes m...@philholmes.net
Cc: lilypond-devel@gnu.org
Sent: Sunday, April 08, 2012 6:19 PM
Subject: Re: Staging/Master Merge - James' Patchy
Hello,
On 8 April 2012 18:11, Phil Holmes m...@philholmes.net wrote
On Sun, Apr 08, 2012 at 06:26:30PM +0100, Phil Holmes wrote:
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
- Original Message -
From: Graham Percival gra...@percival-music.ca
To: Phil Holmes m...@philholmes.net
Cc: James pkx1...@gmail.com; lilypond-devel@gnu.org
Sent: Sunday, April 08, 2012 6:54 PM
Subject: Re: Staging/Master Merge - James' Patchy
On Sun, Apr 08, 2012 at 06:26:30PM +0100
On Sun, Apr 08, 2012 at 07:06:50PM +0100, Phil Holmes wrote:
I did it as a single patch because it really makes sense like that.
There's a lot of changes going on here. 63 deletions from new.
Deleting files from new has nothing to do with a full LSR import.
That is a separate change.
If I
or staging since yesterday. So this is probably just an internet
connection glitch.
James
-- Forwarded message --
From: lilypond.patchy.jl...@gmail.com
Date: 3 April 2012 17:31
Subject: Staging/Master Merge - James' Patchy
To: lilypond-a...@gnu.org, pkx1...@gmail.com
Cc: pkx1...@gmail.com
24 matches
Mail list logo
