git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
MPMatt Porter <mporter@kernel.crashing.org>
Date
May 2, 2005, 17:20 UTC
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:
Show 7 quoted lines
> 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
Previous: Matt PorterNext: Petr Baudis
Message 2 of 3 in “cogito: linux-2.6 merge fails due to cg-rm”
  1. Matt PorterMay 2, 2005
  2. Matt PorterMay 2, 2005
  3. Petr BaudisMay 2, 2005

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.