By Chill35 on

I have used the following book page to commit the Drupal 4.7 version of a new module : http://drupal.org/node/112902.
By the way, if it wouldn't have been for this excellent article provided by Themebot, I would have needed the guidance of another developer, because I don't understand the CVS documentation that's on Drupal.

But now I am stuck. I have updated the module to work for Drupal 5, I have created a branch and a tag for Drupal 5 : DRUPAL-5--1-0. And now what ? I am using TortoiseCVS for Windows. Do I have to create a new directory on my PC and copy the Drupal 5 version in it. If, so, then, after that, how to I commit these files to the right branch and tag ? The documentation is not clear on this. I want from now on to update the 2 branches independantly.

Thank you.

Comments

Tresler’s picture

Tresler commented

1) http://drupal.org/node/100748 - has some more details on CVS, branhing and tagging.

2) TortoiseCVS specific patch applications are here http://drupal.org/node/113172 - I suspect checking in a new branch is similar.

3) If something is lacking you can file an issue against doumentation (it would be welcome)

Thanks and good luck.

Sam Tresler
http://www.treslerdesigns.com
-------------------------------------
"A list of common problems and their solutions can be found in the Troubleshooting FAQ."

Chill35’s picture

Chill35 commented

I'll repeat my question : Do I have to create a new directory on my PC and copy the Drupal 5 version in it. If, so, then, after that, how do I commit these files to the right branch and tag ?

1) 2) Not helpful to answer my question.

3) Will do.

Thanks

P.S. This is a Tortoise-specific question.

Caroline
11 heavens

Chill35’s picture

Chill35 commented

I tried about 20 things is Tortoise but can't figure it out.

Caroline
11 heavens

webchick’s picture

webchick
she/they
Primary language English
Location Vancouver 🇨🇦
commented

But first, I think you owe Sam an apology. He was just trying to help you, and doesn't need to get attitude for it.

I realize that you're frustrated, but remember not to take it out on the people providing support.

Chill35’s picture

Chill35 commented

Let me repeat the question (when I say this, I am talking to EVERYONE that can read this) :

I am using TortoiseCVS for Windows, the GUI Interface, the one where you can right-click on your files and directories in Windows Explorer to access CVS controls such as : update, commit, check out, check-in... etc. I am able to maintain the Drupal 4.7 version branch, and commit the files. My project's name is download_count, it's a module. I can create a branch for Drupal 5, as well as a tag. To easily maintain 2 branches of my project, do I have to create a new directory on my PC and copy the Drupal 5 version in it. Then if I do that, how do I commit these files to that other branch ? Do I have to use 'special update' ? Do I have to check in first the 4.7 version ? I tried about 20 different combinations.

Caroline
11 heavens

webchick’s picture

webchick
she/they
Primary language English
Location Vancouver 🇨🇦
commented

Have fun figuring it out!

Chill35’s picture

Chill35 commented

Indeed it is preferable to use 2 separate folders for 2 branches that one wishes to maintain.

To simplify the procedure of commiting changes, one can go through these 3 steps, once the branch has been created on CVS :

STEP 1 : check out the current snapshot from the desired branch inside an empty folder. The desired branch can be selected by accessing the second tab on the dialog that will open when "checking out". Click on update if the desired branch does not appear in the drop down list : Tortoise (Tortue) will scan CVS.

STEP 2 : edit the file that is checked out

STEP 3 : either commit the file or its folder (as one wishes), & write some text about the changes...

CHECK OUT - EDIT - COMMIT.

Caroline
11 heavens