hello,

On 13/02/14 08:49, James wrote:
Hello,

I've cleared out my .lilypond-patchy-cache too. But I cannot force patchy to merge staging.

I've not had this error before, I understand what it means but not how it happened.

--snip--

08:07:48 (UTC) Begin LilyPond compile, previous commit at 4b3d078b67a013f65e8c039925207dbff19b3080
08:07:53 Merged staging, now at: 4b3d078b67a013f65e8c039925207dbff19b3080
08:07:54     Success:        ./autogen.sh --noconfigure
08:08:04 Success: /tmp/lilypond-autobuild/configure --disable-optimising
08:08:11     Success:        nice make clean
08:09:28     Success:        nice make -j7 CPU_COUNT=7
08:12:07     Success:        nice make test -j7 CPU_COUNT=7
08:31:42     Success:        nice make doc -j7 CPU_COUNT=7
08:31:49 origin has a newer revision than test-staging, not pushing.


I'll delete my test-* branches.

I forgot to do that.

OK let it run for another hour or so - I'll kick it off and then head into work and check when I get there.

james

_______________________________________________
lilypond-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/lilypond-devel

Reply via email to