From: Alan W. I. <ir...@be...> - 2002-07-15 20:44:21
|
I am trying to track down a bug by seeing when it first occurred in CVS. So I naively tried the following: cvs checkout -D '15 days ago' plplot The command did get the version from 15 days ago, but in addition grabbed all the old removed files as well which makes the local tree unusable. For example, I now have plstream.h in two separate directories and our configuration uses the bad (removed) version. The documentation under info cvs implied that cvs kept track of removed files, so why is the above command putting them into my tree? Is this a bug in the CVS server at sourceforge? Anyhow, if anybody knows how to get a clean snapshot from n days ago (where I will probably be doing a binary search on n), please let me know. Alan email: ir...@be... phone: 250-727-2902 FAX: 250-721-7715 snail-mail: Dr. Alan W. Irwin Department of Physics and Astronomy, University of Victoria, P.O. Box 3055, Victoria, British Columbia, Canada, V8W 3P6 __________________________ Linux-powered astrophysics __________________________ |
From: Alan W. I. <ir...@be...> - 2002-07-15 22:12:11
|
Note, by chance I had some snapshots lying around that gave me the clues I needed for the debugging. But 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. Alan email: ir...@be... phone: 250-727-2902 FAX: 250-721-7715 snail-mail: Dr. Alan W. Irwin Department of Physics and Astronomy, University of Victoria, P.O. Box 3055, Victoria, British Columbia, Canada, V8W 3P6 __________________________ Linux-powered astrophysics __________________________ |
From: Maurice L. <mj...@ga...> - 2002-07-17 04:25:25
|
Alan W. Irwin writes: > Note, by chance I had some snapshots lying around that gave me the clues > I needed for the debugging. But 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. The best explanation I can think of is that some cvs versions don't handle file deletion correctly. I had a similar problem in a different cvs repository some time ago. There were some very old files in a repository I use that were in the cvs Attic and clearly removed (from the log entries) but that showed up on a -D style extraction. 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. :( -- Maurice LeBrun mj...@ga... Research Organization for Information Science and Technology of Japan (RIST) |
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 __________________________ |
From: Alan W. I. <ir...@be...> - 2003-01-15 19:11:55
|
On Wed, 15 Jan 2003, Alan W. Irwin wrote: > 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... TTA (terrible typo alert) feature --> future. 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 __________________________ |
From: Maurice L. <mj...@ga...> - 2003-01-15 19:50:15
|
Alan W. Irwin writes: > ... > 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. ... This is really good to see. Thanks Alan! -- Maurice LeBrun mj...@ga... Research Organization for Information Science and Technology of Japan (RIST) |
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 __________________________ |
From: Maurice L. <mj...@ga...> - 2003-01-18 18:03:55
|
Alan W. Irwin writes: > 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. They're all dead, Jim. I did a find..grep through every Attic file and they all have "state dead;" associated with their latest revision. Nor did I see anything else out of whack when comparing specific files under doc/Attic/ to say, those under src/Attic/. So everything looks ok AFAIK; I can't comment on the viewcvs problem. -- Maurice LeBrun mj...@ga... Research Organization for Information Science and Technology of Japan (RIST) |
From: Alan W. I. <ir...@be...> - 2003-01-18 19:20:33
|
On Sat, 18 Jan 2003, Maurice LeBrun wrote: > Alan W. Irwin writes: > > 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. > > I did a find..grep through every Attic file and they all have "state dead;" > associated with their latest revision. Nor did I see anything else out of > whack when comparing specific files under doc/Attic/ to say, those under > src/Attic/. So everything looks ok AFAIK; I can't comment on the viewcvs > problem. Thanks, Maurice, for doing this additional check. That eases my mind considerably! 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 __________________________ |