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

cg-update with local uncommitted changes

From
MHMarcel Holtmann <marcel@holtmann.org>
Date
May 30, 2005, 14:25 UTC
Message-ID
<1117463114.7072.185.camel@pegasus>
Hi Petr,

when doing a cg-update and I have local uncommitted changes it fails with the "... needs update" message. From some previous posts on the mailing list I got the impression that it is possible to pull updates into the local repository with changed files. At the moment I am using the following sequence:

	cg-diff > patch
	cg-cancel
	cg-update origin
	cat patch | patch -p1
	rm patch

The problem with this sequence is when I have added or removed files from my repository. This needs a lot of manual fixing.

With Bitkeeper it was possible to pull changes as long as they don't affect local uncommitted files.

Any ideas on how to implement or if it exists on how to use it?
Regards
Marcel
Next: Petr Baudis
Message 1 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.