From: Alan W. I. <ir...@be...> - 2003-01-17 17:26:23
|
On Wed, 15 Jan 2003, Alan W. Irwin wrote: > [...] 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. Well, the viewcvs problems have not gone away. If you click on the doc directory or the "don't hide" button on the Attic in http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/plplot/plplot/ there are still python exceptions that occur within viewcvs that don't usually occur anywhere else in my experience. So it may be a coincidence that the Attic and doc (two areas which were loaded with zombied files) still show problems, but I urge the next person that merges one branch with another to be extra careful that they are not ressurecting a bunch of old deleted files due to some still existing repository problem. Also, Maurice, when you have a chance could you look in the Attic of the top-level directory and the Attic of the doc directory of the cvs backup (as soon as you get one dated later than my massive deletes of zombied files) to see whether you spot anything that is still wrong with the status flags. In any case we do know my massive deletes did fix the cvs -D option. 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 __________________________ |