From: Darrin Thompson <darrint@progeny.com>
Date: Thu, 14 Jul 2005 21:21:09 GMT
Subject: Re: cg update failing
Message-ID: <1121376069.4729.2.camel@localhost.localdomain>
In-Reply-To: <m3k6jtnod8.fsf@lugabout.cloos.reno.nv.us>

On Thu, 2005-07-14 at 16:06 -0400, James Cloos wrote:
> >>>>> "Darrin" == Darrin Thompson <darrint@progeny.com> writes:
> 
> JimC> cg-merge: merge blocked: seeked from master `----
> 
> Darrin> cg-seek master ?
> 
> :; cg seek master
> On commit 514fd7fd01d378a7b5584c657d9807fc28f22079

Now your merge should not be blocked. No?

--
Darrin