From: Alan W. I. <ir...@be...> - 2003-01-15 18:04:54
|
On Tue, 16 Jul 2002, Maurice LeBrun wrote: > Alan W. Irwin writes: > > I am still quite interested in why > > > > cvs checkout -D '15 days ago' plplot > > > > doesn't give me a clean snapshot for the date specified since it is likely > > I would like to get date-specified snapshots from CVS in the future. > > I'm not really sure, but I've seen something like it before. > [...]When I looked at the files in the repository, they > showed 'state Exp' instead of "state dead" like they should have. After > changing the most recent state entry to "dead" like they should have been, > the -D option worked fine. > > We really need direct access to the repository. :( Just found out how to get rid of these problem with cvs commands. cvs checkout -d plplot1 plplot cvs checkout -D '1 sec ago' -d plplot2 plplot diff -Naur --exclude CVS plplot1 plplot2 |less shows all the (hundreds of) zombied files (those with bad state information). Virtually all had dates prior to 1995 (presumably due to some cvs client or server problem in that era). The few with newer dates were due to an attempt to reuse a removed file (which is a no-no and results in a file that cannot be checked out [unless you use the -D option]). The fix is as follows: cd plplot2 cvs update -A cvs remove -f filename1 filename2 ... filenamezillion cvs commit Periodically, I checked on progress by rm -rf plplot3 cvs checkout -D '1 sec ago' -d plplot3 plplot diff -Naur --exclude CVS plplot1 plplot3 |less Now, after a lot of removes and commits there are no differences left between plplot1 and plplot3. Therefore, I believe I have cleaned up all the state problems that existed in our CVS. This should mean that cvs merges and the cvs -D option should work properly (for the first time in at least 7 years), and the viewcvs errors that occurred for directories (e.g. doc) that had zombied files should be eliminated. I don't plan to check the merge point any time soon, but for those of you who merge in the feature, please be careful to make sure you are not reintroducing these zombied files (lots of them in the top-level directory and the doc directory). I do plan to check the viewcvs result as soon as that server is up again at sourceforge. (It was deliberately taken down yesterday by SF staff, and they hope to get it back today.) At some point we should weed the Attic so that the hundreds of file names that have been removed will be available again for CVS. For now, though, our core developers with cvs access should be careful to not reuse old deleted file names when creating a new file. Alan __________________________ Alan W. Irwin email: ir...@be... phone: 250-727-2902 Astronomical research affiliation with Department of Physics and Astronomy, University of Victoria (astrowww.phys.uvic.ca). Programming affiliations with the Canadian Centre for Climate Modelling and Analysis (www.cccma.bc.ec.gc.ca) and the PLplot scientific plotting software package (plplot.org). __________________________ Linux-powered Science __________________________ |