Re: files are disappearing in git
- From
Petr Baudis <pasky@suse.cz>
- Date
- Nov 25, 2005, 22:57 UTC
- Message-ID
- <20051125225749.GB10680@pasky.or.cz>
- In-Reply-To
- <20051125212846.GB5434@schottelius.org>
Dear diary, on Fri, Nov 25, 2005 at 10:28:46PM CET, I got a letter where Nico -telmich- Schottelius <nico-linux-git@schottelius.org> said that...
Show 16 quoted lines
> > 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.
That's really weird - I can't see anything since then that could influence it. The only possibility is that you were working on those files before, left them modified but uncommitted, then did a merge which would touch them, the merge would fail because of local changes, then you would delete your local instances of the files and try the merge again.
That's something I fixed only very recently and the fix is not even in any public release yet; I didn't realize that it could have such dangerous consequences, but apparently it does. I guess I will release 0.16 final tomorrow.
-- 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.