[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 16:52:41 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.0.92 (gnu/linux) |
address@hidden writes:
> Begin LilyPond compile, commit: aeda0cc2675a13ade10f3f97630ffa7dadd111aa
>
> Success: No new commits in staging
>
> Begin LilyPond compile, commit: aeda0cc2675a13ade10f3f97630ffa7dadd111aa
>
> Success: No new commits in staging
>
> Begin LilyPond compile, commit: aeda0cc2675a13ade10f3f97630ffa7dadd111aa
>
> Success: No new commits in staging
>
> Begin LilyPond compile, commit: aeda0cc2675a13ade10f3f97630ffa7dadd111aa
>
> *** FAILED STEP ***
>
> merge from staging
>
> maybe somebody pushed a commit directly to master?
address@hidden:/usr/local/tmp/lilypond$ git fetch
address@hidden:/usr/local/tmp/lilypond$ git log origin/staging..origin
address@hidden:/usr/local/tmp/lilypond$
Nope. staging is strictly ahead of master.
See also
* commit 0c61221b46addec50e2406e04af44a7d460443d4 (origin/staging)
| Author: Graham Percival <address@hidden>
| Date: Sun Dec 11 23:31:51 2011 -0800
|
| Run astyle 2.02.
|
* commit f8e03b152b436d6034dd17e71335fc6221497571 (HEAD, origin/master, origin/H
| Author: Graham Percival <address@hidden>
| Date: Sun Dec 11 06:40:04 2011 -0800
|
| CG: add gitk to 'push to staging' instructions
|
* commit 5657e399609abfa2436aeec74e2498d16219e813
Lockfile problem or something like that?
--
David Kastrup
- Patchy email, lilypond . patchy . graham, 2011/12/12
- Re: Patchy email,
David Kastrup <=
- 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