Hi,

I checked out the Drupal 5.x dev snapshot of a module I'm maintaining, made some changes, committed and then branched it for Drupal 6.x, as described here:
http://drupal.org/handbook/cvs/quickstart#branch-core

I then went to the project page and added the dev snapshot of Drupal 6.x as a release, but for some reason the Drupal 5.x code was released as the 6.x branch. So I reviewed the revision graph of one of the files, using TortoiseCVS, and it shows no code under the Drupal 6.x branch and my 6.x changes under a new 1.2 revision of HEAD. The D6 code did not get placed in the D6 branch for some weird reason.

For now I have tagged the release as DRUPAL-6--1-0-BETA1 and switched off the dev snapshot, just to avoid confusion, and this has worked, but the tagged code still seems to not reside under the Drupal 6 branch.

Could someone take a look please? Affected project is:
http://drupal.org/project/uc_worldpay

Comments

dww’s picture

dww
we/he/they
commented
Title: CVS issues » CVS quickstart doesn't remind people after they create a branch to update their workspace
Project: Drupal.org infrastructure » Documentation
Component: CVS » Correction/Clarification

A) It's evil that the CVS quickstart doesn't remind you that after you run "cvs tag -b" that only creates a new branch but doesn't automatically update your workspace to start using it. CVS GUIs probably obscure this fact even more.

B) #344234: Print warning message after branch creation to update workspace.

Anyway, your solution is to checkout a workspace from your DRUPAL-6--1 branch, apply your D6 changes there (you can probably just copy the latest files from HEAD, or reapply your patch, whatever), and then commit those to your branch.

Remember, always run "cvs diff" and "cvs status" before you run "cvs commit".

Since B) already exists as a separate issue, I'm turning this from what should have been submitted as a "support request" into a Documentation bug report.

jbrauer’s picture

jbrauer commented
Status: Active » Fixed

Updated the quickstart page with this info. Thanks!

Status: Fixed » Closed (fixed)

Automatically closed -- issue fixed for two weeks with no activity.