[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Patchy email
From: |
David Kastrup |
Subject: |
Re: Patchy email |
Date: |
Mon, 12 Dec 2011 17:08:54 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.0.92 (gnu/linux) |
Graham Percival <address@hidden> writes:
> On Mon, Dec 12, 2011 at 04:52:41PM +0100, David Kastrup wrote:
>> address@hidden writes:
>>
>> > *** FAILED STEP ***
>> >
>> > merge from staging
>> >
>> > maybe somebody pushed a commit directly to master?
>>
>> Nope. staging is strictly ahead of master.
>>
>> Lockfile problem or something like that?
>
> I suspect that test-staging was still at the old version. I
> cleared it out and started another run. Actually, I think I
> should eliminate test-staging as well as test-master-lock.
If I remember correctly, test-staging is reset to upstream at the start
of the test run. So test-staging is nothing more than a record of what
version Patchy has been testing and will eventually try to push.
Clearing it out should not be necessary: that will be done anyway with
the next run.
It is more likely that test-master-lock still was around for some
reason.
--
David Kastrup
- Patchy email, lilypond . patchy . graham, 2011/12/12
- Patchy email, lilypond . patchy . graham, 2011/12/12
- Patchy email, lilypond . patchy . graham, 2011/12/21
- Patchy email, lilypond . patchy . graham, 2011/12/22
- Patchy email, lilypond . patchy . graham, 2011/12/22
- Patchy email, lilypond . patchy . graham, 2011/12/22
- Patchy email, lilypond . patchy . graham, 2011/12/22
- Patchy email, lilypond . patchy . graham, 2011/12/26