Re: cogito: linux-2.6 merge fails due to cg-rm

From: Petr Baudis <pasky@ucw.cz>
Date: May 2, 2005, 23:10 UTC
Message-ID: <20050502231021.GI20818@pasky.ji.cz>
In-Reply-To: <20050502102034.B21716@cox.net>

Dear diary, on Mon, May 02, 2005 at 07:20:34PM CEST, I got a letter where Matt Porter <mporter@kernel.crashing.org> told me that...

Show 13 quoted lines

> 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.

Oops, this was de facto fixed long time ago (by Junio) but for some reason was not physically merged to my tree. (He already pointed out, but I re-forgot to fix it back then.) update-cache --remove is supposed to remove missing files, so the cg- code is correct.

Should be fixed now. Thanks for pointing it out.

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor