From: Matt Porter <mporter@kernel.crashing.org>
Date: Mon, 02 May 2005 17:20:34 GMT
Subject: Re: cogito: linux-2.6 merge fails due to cg-rm
Message-ID: <20050502102034.B21716@cox.net>
In-Reply-To: <20050502101250.A21716@cox.net>

On Mon, May 02, 2005 at 10:12:50AM -0700, Matt Porter wrote:
> These kept showing up as "needs merged" even though I explicitly
> tried to cg-rm them or "update-cache --remove" them. It turns out
> that cg-rm is 'rm -f'ing the files before calling update-cache.
> By touching each file, and then modifying cg-rm as follows, I
> was able to complete the merge. I'm not sure yet if this is the
> proper fix to the cogito script. It at least made update-cache
> happy for this remove case.

Looking a bit further, I see the cg-Xmergefile also removes the
file before update-cache --remove which doesn't seem to work. This
seems to be the actual culprit during the merge, but cg-rm needed
fixed to manually fix without calling git commands directly.

-Matt