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

Re: cg-update question.

From
Petr Baudis <pasky@suse.cz>
Date
Sep 12, 2005, 00:02 UTC
Message-ID
<20050912000210.GA15630@pasky.or.cz>
In-Reply-To
<43082A96.1070700@mozilla.org>

Dear diary, on Sun, Aug 21, 2005 at 09:17:42AM CEST, I got a letter where Johnny Stenback <jst@mozilla.org> told me that...

> Hi all,
Hello,
Show 12 quoted lines
> I just realized that if I've got an uncommitted local change in a tree 
> and I update my tree with cg-update to merge in changes from a different 
> tree... cg-update will pull the changes and do the merge. So that's all 
> cool, but as it does the merge, it will re-write my local file that has 
> the uncommitted change, even if that file didn't change in the 
> repository I pulled from, i.e. nothing to merge for that file.
> 
> This is, to me at least, not the desired behavior, if there's no reason 
> for cg-update to touch a file it shouldn't.
> 
> Thoughts? If someone points me in the right direction I'm willing to 
> take a stab at fixing this myself...

can you provide a concrete example of such a situation? This should never ever happen - cg-update should refuse to touch any files containing uncommitted changes.

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
If you want the holes in your knowledge showing up try teaching
someone.  -- Alan Cox
Previous: Johnny Stenback
Message 2 of 2 in “cg-update question.”
  1. Johnny StenbackAug 21, 2005
  2. Petr BaudisSep 12, 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.