Re: locked out by partial cvsmerge

ons 2007-02-28 klockan 18:16 +1300 skrev squid3@treenet.co.nz:

> Or we could call a 48+ hour holiday for any usage of HEAD and see if the
> locks disappear. Mine was either created 18 hours ago now or 36.
>
> For my part I'm going to stop-work until this gets fixed or someone else
> can run a full cvsmerge HEAD without encountering it.

Lets see.. Running cvsmerge in the gzip branch now.

Took quite a while (minutes), but seems to work just fine. Was a minor
merge conflict needing manual attention, but no locks in the way.

Regards
Henrik