[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Problem with cvs ci of modified dead file
From: |
Bill Studenmund |
Subject: |
Problem with cvs ci of modified dead file |
Date: |
Mon, 10 Sep 2001 19:28:15 -0700 (PDT) |
I had checked out a source directory and started modifying it. One of my
coleagues deleted some of the files. I found out about this when I did a
cvs update. As I had extensive local mods to the files, the file contents
survived death. I checked things over, and then committed my versions of
the files.
I ended up with "live" versions of the file (cvs diff showed no
differences, cvs update didn't change things), but when ever I (or anyone
else) tried to check out the files to a new tree, the files didn't show
up.
Here's a status line from one of the zombie files:
===================================================================
File: distinfo Status: Up-to-date
Working revision: 1.4
Repository revision: 1.4
/cvsroot/pkgsrc/net/ucd-snmp-current/Attic/distinfo,v
Sticky Tag: (none)
Sticky Date: (none)
Sticky Options: (none)
Note that a live file is in the attic. I think that's the problem.
I was able to fix things by copying the files to a safe place, cvs rm'ing
them, checking the deletion in, copying the files back, doing a cvs add,
and then checking things in again.
My experimentation indicates that the bug can be reproduced with:
For a file which is dead:
cvs update -r <version before death> <file>
Modify file extensively
(not sure how extensive is needed, just enough for the next
command to not kill the file)
cvs update -A
We now end up with diffs relative to a dead file.
cvs ci
We now have a zombie file.
I'm using version 1.11 on both the client and server, but nothing in the
NEWS file mentioned fixing a problem like this.
Take care,
Bill
- Problem with cvs ci of modified dead file,
Bill Studenmund <=