Re: Can't push staging to master

[Phil Holmes]

----- Original Message ----- 
From: "David Kastrup" <address@hidden>
> 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


Logged out and in again to ensure that no spare processes were running.  Ran 
patchy again and again got the "Stopped" message.  Then remembered I'd been 
putting debug stuff in my local copy that included a line:

test=raw_input("Stopped")

Thunk.  Thunk.  Hit return and it's now running OK.  Red face.

--
Phil Holmes