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

Re: cg update failing

From
Petr Baudis <pasky@suse.cz>
Date
Jul 20, 2005, 01:07 UTC
Message-ID
<20050720010712.GB2255@pasky.ji.cz>
In-Reply-To
<m3eka04shr.fsf@lugabout.cloos.reno.nv.us>

Dear diary, on Fri, Jul 15, 2005 at 06:12:48AM CEST, I got a letter where James Cloos <cloos+vger-git@jhcloos.com> told me that...

Show 6 quoted lines
> Well, it wasn't as Ok as I first thought.  There were several .rej and
> backup files as left behind by patch(1).  cg update HEAD says:  Branch
> already fully merged but Makefile still says 2.6.12.
> 
> I'm cloning now to a remote uml and will try and rsync from there to
> the laptop.  Perhaps *that* will get me a working repo.

Huh. Well, you had to do uberweird things with your repository - why did you cg-seek at all? What Cogito version is it?

Anyway, cg-reset (or cg-cancel in "older" Cogito) should bring everything in shape.

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
If you want the holes in your knowledge showing up try teaching
someone.  -- Alan Cox
Previous: James CloosNext: James Cloos
Message 7 of 9 in “cg update failing”
  1. James CloosJul 14, 2005
  2. Darrin ThompsonJul 14, 2005
  3. James CloosJul 14, 2005
  4. Darrin ThompsonJul 14, 2005
  5. James CloosJul 14, 2005
  6. James CloosJul 15, 2005
  7. Petr BaudisJul 20, 2005
  8. James CloosJul 20, 2005
  9. Petr BaudisJul 20, 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.