[drupal-devel] Okay, I think I borked my CVS...what do I do now?
My original goal was to take the "hof" module from my sandbox/syscrusher/hof and put it into modules/hof for release, based on favorable test reports and no outstanding bugs. After reading the Contributor Guide, I *thought* what I needed to do was to checkout DRUPAL-4-6 branch of contributions, then put my module into there and tag it appropriately. When I did the CVS add, however, CVS reported that the per-directory sticky tag on the parent directory (modules) made the tag redundant. Okay, I thought, I'll just proceed to add the new files. That seemed to work, but they didn't show up on the CVS browser on drupal.org, which thought that the files didn't match any branch tag (nor head -- it said the files were there but didn't match even if I said "show all files"). So I did a CVS remove on that version (the original being still in my sandbox) and recommitted. I went back and re-read the docs, and concluded (apparently wrong) that I really needed to do an explicit "cvs tag -b DRUPAL-4-6" with the files existing physically under contributions/modules in my local copy of HEAD, and that this should make them appear in a checked-out 4.6 local copy. Apparently, I've thoroughly borked this, because I now can't get the files to show up in a 4.6 checkout, but can't get CVS to remove them so I can start over. I'm sorry to be dense here -- I *did* read the docs, but apparently I didn't do something correctly. Can someone suggest what I should do next? Scott -- ------------------------------------------------------------------------------- Scott Courtney Drupal user name: "syscrusher" http://drupal.org/user/9184 scott@4th.com Drupal projects: http://drupal.org/project/user/9184 Sandbox: http://cvs.drupal.org/viewcvs/drupal/contributions/sandbox/syscrusher
Syscrusher wrote:
Apparently, I've thoroughly borked this, because I now can't get the files to show up in a 4.6 checkout, but can't get CVS to remove them so I can start over.
Hmm, I see how it is and can imagine sort of how it got there. The revision you tagged with DRUPAL-4-6 no longer exists. I'm guessing that's because you removed it. For exmaple, in hof.module, the DRUPAL-4-6 tag is on the 1.1.0.2 revision, but the only revisions that seem to exist are: 1.2, 1.2, 1.1.2.2, and 1.1.2.1. So checking out DRUPAL-4-6 gets nothing for that file. Probably the same for the others. You might be able to fix this by forcibly deleting the tags (cvs tag -d DRUPAL-4-6) and then rebranching/tagging the files. ..chris
On Monday 11 April 2005 21:45, Chris Johnson wrote:
Hmm, I see how it is and can imagine sort of how it got there. The revision you tagged with DRUPAL-4-6 no longer exists. I'm guessing that's because you removed it.
That's correct. I mistakenly thought that removing the files would allow me to start over with the tagging process; I didn't realize the tag would persist even when the files were gone. :-(
For exmaple, in hof.module, the DRUPAL-4-6 tag is on the 1.1.0.2 revision, but the only revisions that seem to exist are: 1.2, 1.2, 1.1.2.2, and 1.1.2.1. So checking out DRUPAL-4-6 gets nothing for that file. Probably the same for the others.
Yes, that is correct.
You might be able to fix this by forcibly deleting the tags (cvs tag -d DRUPAL-4-6) and then rebranching/tagging the files.
I tried this, but CVS gives the following messages: (from inside the "hof" directory...) $ cvs tag -d DRUPAL-4-6 cvs tag: warning: directory CVS specified in argument cvs tag: but CVS uses CVS for its own purposes; skipping CVS directory cvs tag: Untagging . cvs tag: Not removing branch tag `DRUPAL-4-6' from `/cvs/drupal-contrib/contributions/modules/hof/CHANGELOG.txt,v'. cvs tag: Not removing branch tag `DRUPAL-4-6' from `/cvs/drupal-contrib/contributions/modules/hof/INSTALL.txt,v'. cvs tag: Not removing branch tag `DRUPAL-4-6' from `/cvs/drupal-contrib/contributions/modules/hof/README.txt,v'. cvs tag: Not removing branch tag `DRUPAL-4-6' from `/cvs/drupal-contrib/contributions/modules/hof/TODO.txt,v'. cvs tag: Not removing branch tag `DRUPAL-4-6' from `/cvs/drupal-contrib/contributions/modules/hof/hof.module,v'. Any other ideas? I'm thinking the only way to get rid of this problem may be for someone with appropriate access to physically nuke this directory from the repository. Again, my apologies for screwing this up. Scott -- ------------------------------------------------------------------------------- Scott Courtney Drupal user name: "syscrusher" http://drupal.org/user/9184 scott@4th.com Drupal projects: http://drupal.org/project/user/9184 Sandbox: http://cvs.drupal.org/viewcvs/drupal/contributions/sandbox/syscrusher
Syscrusher wrote:
On Monday 11 April 2005 21:45, Chris Johnson wrote:
You might be able to fix this by forcibly deleting the tags (cvs tag -d DRUPAL-4-6) and then rebranching/tagging the files.
I tried this, but CVS gives the following messages:
(from inside the "hof" directory...)
$ cvs tag -d DRUPAL-4-6 cvs tag: warning: directory CVS specified in argument cvs tag: but CVS uses CVS for its own purposes; skipping CVS directory cvs tag: Untagging . cvs tag: Not removing branch tag `DRUPAL-4-6' from `/cvs/drupal-contrib/contributions/modules/hof/CHANGELOG.txt,v'. cvs tag: Not removing branch tag `DRUPAL-4-6' from `/cvs/drupal-contrib/contributions/modules/hof/INSTALL.txt,v'. cvs tag: Not removing branch tag `DRUPAL-4-6' from `/cvs/drupal-contrib/contributions/modules/hof/README.txt,v'. cvs tag: Not removing branch tag `DRUPAL-4-6' from `/cvs/drupal-contrib/contributions/modules/hof/TODO.txt,v'. cvs tag: Not removing branch tag `DRUPAL-4-6' from `/cvs/drupal-contrib/contributions/modules/hof/hof.module,v'.
Uh, yeah. I did not double check on the "cvs tag -d" and how it behaves with branches before posting. Normally, it doesn't allow you to remove branch tags. That can be forced using the -B option, but the amount of "warning" text in the documentation leads me to think that maybe you should wait for someone with full access to the repository. Of course, you could try it anyway, since you probably can't screw up your module's files any worse than they are. :-) When you removed "the files" you really only removed revisions. The files were still there. CVS is sort of like write-only memory. :-) Once a file goes into it, there's no getting rid of it except to actually remove it at the filesystem level from the repository. -- Chris Johnson
When you removed "the files" you really only removed revisions. The files were still there. CVS is sort of like write-only memory. :-) Once a file goes into it, there's no getting rid of it except to actually remove it at the filesystem level from the repository.
And this is why people actually use CVS :) Goba
On Tuesday 12 April 2005 06:44, Gabor Hojtsy wrote:
When you removed "the files" you really only removed revisions. The files were still there. CVS is sort of like write-only memory. :-) Once a file goes into it, there's no getting rid of it except to actually remove it at the filesystem level from the repository.
And this is why people actually use CVS :)
Yeah, I know. :-( I'm spoiled...on the CVS system I use at work, I have root on the server, so when something like this happens, I can zap the directory in the repository and reimport. I'm able to make CVS do what I want most of the time, and I've bought the Karl Fogel book on the subject to learn more, but I'm unfortunately not yet an expert. It's embarrassing to make a mistake like this in such a public venue. Scott -- ------------------------------------------------------------------------------- Scott Courtney Drupal user name: "syscrusher" http://drupal.org/user/9184 scott@4th.com Drupal projects: http://drupal.org/project/user/9184 Sandbox: http://cvs.drupal.org/viewcvs/drupal/contributions/sandbox/syscrusher
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 12 Apr 2005, at 3:07 PM, Syscrusher wrote:
I'm able to make CVS do what I want most of the time, and I've bought the Karl Fogel book on the subject to learn more, but I'm unfortunately not yet an expert. It's embarrassing to make a mistake like this in such a public venue.
Don't be embarrassed, CVS is nigh on incomprehensible to most people. CVS is just used so widely because it has always been the default choice. - -- Adrian Rossouw Drupal developer and Bryght Guy http://drupal.org | http://bryght.com -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (Darwin) iD8DBQFCXcbV6lSw9JdoA/wRAoq5AJ9IEkv52CtR54zPPI5GJn8F2JsBcwCgy2Xj bazv1cbfzvppAbnaxWkPtAU= =88hJ -----END PGP SIGNATURE-----
On Apr 12, 2005 3:49 AM, Syscrusher <scott@4th.com> wrote:
After reading the Contributor Guide, I *thought* what I needed to do was to checkout DRUPAL-4-6 branch of contributions, then put my module into there and tag it appropriately. When I did the CVS add, however, CVS reported that the per-directory sticky tag on the parent directory (modules) made the tag redundant.
Okay, I thought, I'll just proceed to add the new files. That seemed to work, but they didn't show up on the CVS browser on drupal.org, which thought that the files didn't match any branch tag (nor head -- it said the files were there but didn't match even if I said "show all files").
What you did wrong is you tried to import a directory into a branch. So the directory was created only for branch and would not appear in HEAD since you added it only to branch. The correct order: 1. Checkout modules HEAD. 2. copy hof directory from sandbox, make sure there are no CVS directories inside 3. cvs add hof && cvs add hof/* . Commit them, they will appear in CVS. 4. Only then branch your module for 4.6. menesis
participants (5)
-
Adrian Rossouw -
Chris Johnson -
Gabor Hojtsy -
menesis -
Syscrusher