Re: files are disappearing in git

From: Nico -telmich- Schottelius <nico-linux-git@schottelius.org>
Date: Nov 25, 2005, 21:28 UTC
Message-ID: <20051125212846.GB5434@schottelius.org>
In-Reply-To: <Pine.LNX.4.64.0511251022360.13959@g5.osdl.org>

Good evening,

Linus Torvalds [Fri, Nov 25, 2005 at 11:12:00AM -0800]:

Show 5 quoted lines

>   Nico gave me private access to the tree, so I quickly cloned it and 
> started bisecting it to figure out where the problem was. I haven't looked 
> at the source code, and all the commit messages seem to be in German 
> (which I can kind of understand if I work at it, but not very well), but 
> it definitely turns out none of that matters.

Well, there's still a broken username, but that's our problem with iso8859-1 in passwd.

> 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.

Good to know, we didn't that we lost it until now :)

> Pasky - do you know of any historical cogito problems like this?

For information:

[22:07] srsyg03:packages% ls -l /usr/packages insgesamt 28 drwxr-xr-x 4 root root 4096 Nov 10 15:52 cogito-/ drwxr-xr-x 4 root root 4096 Okt 14 15:15 cogito-0.15/ drwxr-xr-x 4 root root 4096 Nov 23 13:31 cogito-73874dddeec2d0a8e5cd343eec762d98314def63/ drwxr-xr-x 4 root root 4096 Okt 14 15:15 cvsps-2.1/ drwxr-xr-x 4 root root 4096 Nov 10 15:52 git-/ drwxr-xr-x 4 root root 4096 Okt 17 14:09 git-20051016.git/ drwxr-xr-x 4 root root 4096 Nov 23 13:31 git-c61642185d411e5e3350566a68483e358ca392b9/

At the time of 2005-11-17 we'll have used a cogito and git version, which was from 2005-11-10.

Show 6 quoted lines

> [...] 
> So I do not see how that bad commit happened, especially since it's even 
> a fairly recent commit (the date of the merge is 2005-11-17).
> 
> I wonder if there's a really old and broken version of cogito somewhere 
> around. If so, it's on "srsyg03".

Above you see the versions of which were/are installed. I always link the latest binaries to /usr/local/bin/, so our developers do not need to care about what version we have.

> (And the two commits that needed manual merging _look_ fine. No lost files 
> at least, except for one of the merges losing "bitte_bitte_loesch_mich", 
> which judging by it's name _should_ be lost ;)

Those were some lessons in our house. Our developers had to test if everything works, including deleting :)

> Finally: Nico, I've deleted the trees on my machine, and you can remove my 
> ssh key. I don't think I can tell you anything more.

Ok. Thanks for your help! I think we'll add those four files back to git on monday and continue to work with them.

Nico

-- 
Latest project: cinit-0.2.1 (http://linux.schottelius.org/cinit/)
Open Source nutures open minds and free, creative developers.