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

Re: files are disappearing in git

From
Petr Baudis <pasky@suse.cz>
Date
Nov 25, 2005, 19:39 UTC
Message-ID
<20051125193932.GY10680@pasky.or.cz>
In-Reply-To
<Pine.LNX.4.64.0511251022360.13959@g5.osdl.org>

Dear diary, on Fri, Nov 25, 2005 at 08:12:00PM CET, I got a letter where Linus Torvalds <torvalds@osdl.org> said that...

Show 11 quoted lines
> The problem is a bad merge. And in fact, that merge lost _more_ than just 
> the three files under Code/Spikes/Statistik/, it also lost a file called 
> Code/lw1/Client/Pics/icon/lw1-icon.png.
> 
> I don't quite see _how_ it lost them. The merge in question is a totally 
> trivial in-index merge, and when I re-do it, I don't lose those files. In 
> this case, all the lost files were from the "other branch" of the merge, 
> and they were new to that branch. IOW, in git-merge-one-file parlance, it 
> is that trivial "added in one" case.
> 
> Pasky - do you know of any historical cogito problems like this?

Puzzling. In the past, cg-merge might get confused by merging on top of tree with some uncommitted changes (either deleting them, or possibly intermixing them with the merge - not sure about the latter now), but a quick scan of Cogito changes over the last few months shows no other bugs, and I can't remember any major bugfixes besides this either.

Any idea what Cogito version (roughly) could have been used to perform the merge, Nico?

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
VI has two modes: the one in which it beeps and the one in which
it doesn't.
Previous: Linus TorvaldsNext: Ryan Anderson
Message 9 of 15 in “files are disappearing in git”
  1. Nico -telmich- SchotteliusNov 23, 2005
  2. Linus TorvaldsNov 23, 2005
  3. Nico -telmich- SchotteliusNov 24, 2005
  4. Junio C HamanoNov 24, 2005
  5. Nico -telmich- SchotteliusNov 24, 2005
  6. Ryan AndersonNov 25, 2005
  7. Nico -telmich- SchotteliusNov 25, 2005
  8. Linus TorvaldsNov 25, 2005
  9. Petr BaudisNov 25, 2005
  10. Ryan AndersonNov 25, 2005
  11. Junio C HamanoNov 25, 2005
  12. Linus TorvaldsNov 25, 2005
  13. Petr BaudisNov 25, 2005
  14. Nico -telmich- SchotteliusNov 25, 2005
  15. Petr BaudisNov 25, 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.