From mboxrd@z Thu Jan  1 00:00:00 1970
From: Darrin Thompson <darrint@progeny.com>
Subject: Re: cg update failing
Date: Thu, 14 Jul 2005 16:21:09 -0500
Message-ID: <1121376069.4729.2.camel@localhost.localdomain>
References: <m3oe95qn64.fsf@lugabout.cloos.reno.nv.us>
	 <1121365461.4729.0.camel@localhost.localdomain>
	 <m3k6jtnod8.fsf@lugabout.cloos.reno.nv.us>
Mime-Version: 1.0
Content-Type: text/plain
Content-Transfer-Encoding: 7bit
Cc: git@vger.kernel.org
X-From: git-owner@vger.kernel.org Thu Jul 14 23:21:42 2005
Return-path: <git-owner@vger.kernel.org>
Received: from vger.kernel.org ([12.107.209.244])
	by ciao.gmane.org with esmtp (Exim 4.43)
	id 1DtB95-0003tC-HF
	for gcvg-git@gmane.org; Thu, 14 Jul 2005 23:21:27 +0200
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S261725AbVGNVVP (ORCPT <rfc822;gcvg-git@m.gmane.org>);
	Thu, 14 Jul 2005 17:21:15 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261728AbVGNVVP
	(ORCPT <rfc822;git-outgoing>); Thu, 14 Jul 2005 17:21:15 -0400
Received: from zealot.progeny.com ([216.37.46.162]:32643 "EHLO
	morimoto.progeny.com") by vger.kernel.org with ESMTP
	id S261725AbVGNVVL (ORCPT <rfc822;git@vger.kernel.org>);
	Thu, 14 Jul 2005 17:21:11 -0400
Received: from dhcp-2-246.progeny.com (dhcp-2-246.progeny.com [192.168.2.246])
	by morimoto.progeny.com (Postfix) with ESMTP
	id 5509A636AF; Thu, 14 Jul 2005 16:21:10 -0500 (EST)
To: James Cloos <cloos+vger-git@jhcloos.com>
In-Reply-To: <m3k6jtnod8.fsf@lugabout.cloos.reno.nv.us>
X-Mailer: Evolution 2.2.3 
Sender: git-owner@vger.kernel.org
Precedence: bulk
X-Mailing-List: git@vger.kernel.org

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