[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Unable to merge staging
From: |
James |
Subject: |
Unable to merge staging |
Date: |
Thu, 13 Feb 2014 08:49:08 +0000 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 |
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.
--snip--
Regards
James
- Unable to merge staging,
James <=