By ingridlael on

After being approved for CVS access and having my module ready, I've started learning how to deal with tag, branches and module uploading via Tortoise CVS.

I have managed to make the 5.x release but now I'd like to upload the 6.x branch of the module and can't. I have already tried making a new branch, tag but TortoiseCVS keeps telling me there are overlapped files and messes with my current 5.x profile.

I've read the handbooks but I still find them confusing. Can someone give me a hand please?

⋅ Categories: Drupal 5.x, Drupal 6.x

Comments

add1sun’s picture

add1sun commented

Hm. So it looks like you have a DRUPAL-5 branch and a DRUPAL-6--8 branch. (Typically you start branches at 1 so it should normally be DRUPAL-6--1.)

The biggest problem that people hit with branches is working form the wrong one. If you are in HEAD and make a branch, then you need to switch to the branch to keep working in it. So basically what I do is keep a separate checkout for each branch (and HEAD) so that I don't get them mixed up by switching back and forth, similar to the example in http://drupal.org/node/315987. I'd checkout HEAD, branch to DRUPAL-5, then create a new checkout of the DRUPAL-5 branch in a folder *next to* my HEAD checkout, etc. Then if I want to work on 5, I go into that checkout. If I want to work on 6 I go into my DRUPAL-6--1 checkout. I also *always* check what branch I am working on before I do work and commit. I don't know Tortoise, but on the command line you just need to do cvs st mymodule.module (where st stands for status). You'll see something like "Sticky Tag: DRUPAL-6--1." If Sticky tag says (none), then you are in HEAD. That lets me know if I'm in the right place before I start committing things willy-nilly.

Lullabot loves you
Our O'Reilly book is out! Using Drupal

Drupalize.Me, The best Drupal training, available all the time, anywhere!

ingridlael’s picture

ingridlael commented

Thank you very much for your prompt response add1sun.
I was indeed cheking out the correct (and only) branch I submitted, my problem was with the whole CVS thing-a-ma-bob (I absolutely HATE the f*cking thing).
After following http://themebot.com/tips-and-tutorials/quickstart-guide-for-cvs-and-cont... everything kinda started working.

Thanks again.