Added new files on DRUPAL-4-7 -> a mess
Hello! I need a CVS guru to help me clean up a mess I seem to have made... I added a new module: image_enhanced_scaling (which is awesome by the way!) to CVS. As i developed it for 4.7 and I consider it production stable I committed it to the DRUPAL-4-7 branch right away. Now I can't get into the MAIN branch at all. What should I do? For your information I'm using a GUI app on Mac called MacCVSClient X. I have checked out two separate versions of the respository: one tag-less (= MAIN?) and one with DRUPAL-4-7. No matter which I use to commit the files, they end up with the DRUPAL-4-7 tag. If someone with enough priviliges would make a new revision of the files in the MAIN branch, I would not be offended... Any help appreciated! :) Thanks, Hannes Lilljequist
On Thu, 2006-10-12 at 03:05 +0200, Hannes Lilljequist wrote:
Hello! I need a CVS guru to help me clean up a mess I seem to have made... I added a new module: image_enhanced_scaling (which is awesome by the way!) to CVS. As i developed it for 4.7 and I consider it production stable I committed it to the DRUPAL-4-7 branch right away. Now I can't get into the MAIN branch at all. What should I do?
For your information I'm using a GUI app on Mac called MacCVSClient X. I have checked out two separate versions of the respository: one tag-less (= MAIN?) and one with DRUPAL-4-7. No matter which I use to commit the files, they end up with the DRUPAL-4-7 tag.
If someone with enough priviliges would make a new revision of the files in the MAIN branch, I would not be offended... Any help appreciated! :)
Thanks,
Hannes Lilljequist
You should probably check out a head branch, then commit to it. I have checkouts for 4-6, 4-7, and HEAD.
You should probably check out a head branch, then commit to it. I have checkouts for 4-6, 4-7, and HEAD.
Thanks for the tip! I checked out the HEAD branch and it looked good: my files were not there. So I tried to add them, but I got this error: cvs add: cannot add file on non-branch tag `HEAD' (I also checked out the MAIN branch, but that doesn't seem to be right because there were only like four modules that had files in there...) Any ideas? /Hannes
I added a new module: image_enhanced_scaling (which is awesome by the way!) to CVS. As i developed it for 4.7 and I consider it production stable I committed it to the DRUPAL-4-7 branch right away. Now I can't get into the MAIN branch at all. What should I do?
I managed to solve it, finally. I simply used the command line CVS client to check out the module without specifying a tag. Added the files (they weren't there) and commited. Easy. I guess I will put less trust in my GUI CVS client MacCVSClient X from now on... /Hannes
participants (2)
-
Darrel O'Pry -
Hannes Lilljequist