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

Re: cg-update with local uncommitted changes

From
Petr Baudis <pasky@ucw.cz>
Date
May 31, 2005, 16:04 UTC
Message-ID
<20050531160426.GB7013@pasky.ji.cz>
In-Reply-To
<20050530192541.GA27047@tumblerings.org>

Dear diary, on Mon, May 30, 2005 at 09:25:41PM CEST, I got a letter where Zack Brown <zbrown@tumblerings.org> told me that...

Show 11 quoted lines
> On Mon, May 30, 2005 at 04:25:14PM +0200, Marcel Holtmann wrote:
> > Hi Petr,
> > 
> > when doing a cg-update and I have local uncommitted changes it fails
> > with the "... needs update" message.
> 
> I don't see failures, but I do see the "needs update" message often when
> I do cg-update. If I run cg-update a second time it says the tree is fully
> up-to-date. However, if I then do a cg-diff, I will see tons of diff output.
> This is on a tree (the kernel) that I haven't modified at all, I only track it
> with cg-update.

This is strange. I've just did a cg-update on a kernel tree I've left untouched for more than a week (and I've even locally modified one file) and everything went fine.

> I also track Cogito, and I use the latest form of all git and Cogito tools.
> Maybe somewhere along the line I've corrupted my repo by using incompatible
> versions of the git/Cogito toolset.

That's entirely possible given the big output format changes from some git tools. Hopefully most of those problems should be already fixed.

> I've noticed if I do a fresh cg-clone the problem seems to go away.

Tip of the day: cg-cancel will fix almost any working state messup (any messup as long as you have proper commit id in your refs/heads/master file).

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor
Previous: Zack Brown
Message 12 of 12 in “cg-update with local uncommitted changes”
  1. Marcel HoltmannMay 30, 2005
  2. Petr BaudisMay 30, 2005
  3. Marcel HoltmannMay 30, 2005
  4. Marcel HoltmannMay 30, 2005
  5. Petr BaudisJun 2, 2005
  6. Marcel HoltmannJun 2, 2005
  7. Petr BaudisJun 5, 2005
  8. Dan HolmsandMay 30, 2005
  9. Petr BaudisMay 31, 2005
  10. Dan HolmsandMay 31, 2005
  11. Zack BrownMay 30, 2005
  12. Petr BaudisMay 31, 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.