Re: Can't push staging to master

[David Kastrup]

"Phil Holmes" <address@hidden> writes:

> I tried running lilypond-patchy-staging.py early this morning while I
> had my breakfast.  When I looked at the terminal it just said
> "Stopped" - there was no CPU or disk activity and the logfile said:
>
> Begin LilyPond compile, commit: 6ec4177a4076c45e00e904fd6457dcf57130119d

Current master.

> Merged staging, now at: 10af9324c6d94453857e10951c4f58043e9a9f11

One commit later

> Success:  ./autogen.sh --noconfigure
> Success:  ../configure --disable-optimising
>
> Begin LilyPond compile, commit:
> 6ec4177a4076c45e00e904fd6457dcf57130119d

Current master.

> *** FAILED STEP ***
> merge from staging
> maybe somebody pushed a commit directly to master?

Little reason for these messages.

> Begin LilyPond compile, commit: 6ec4177a4076c45e00e904fd6457dcf57130119d
> Merged staging, now at: 3fa8dfbe7c4d70010f5182f3c684f241762d9ec9

Current staging, looks normal.

> Success:  ./autogen.sh --noconfigure
> Success:  ../configure --disable-optimising
> Begin LilyPond compile, commit:
> 6ec4177a4076c45e00e904fd6457dcf57130119d

Also normal

> *** FAILED STEP ***
> merge from staging
> maybe somebody pushed a commit directly to master?

Again interspersed messages not belonging in here.

>
> Help with this gratefully received.

This sounds like a cron-job still bound on a task that has not finished.

You wrote:

    I had to get off to college, so Ctrl-Z and hibernate.  Tried again
    just now and got a message saying 'test-master-lock' already exists,
    and it deleted it. It now won't merge.  The logfile shows:

One thing to note: if you properly kill the patchy job, it will delete
the lock file.  Apparently you did not kill the old job, but deleted the
lock file nevertheless.  And you now have a rampaging old patchy
confused by the new patchy messing with its directory.

Just make sure that your system is clear of any patchy process running
or paused.  Once you are really sure that this is the case, delete the
lock branch if it still around.  And then things should work as expected
again.

-- 
David Kastrup