CVS: Confusing Versioning Silliness

After reading this fast and furious groups.drupal.org discussion thread (posted in Issue tracking and software releases, New Release System, Revision Control Systems, and Drupalchix) on cvs contrib procedure, I had one reaction:

i want to go hide and never try to contribute code again

Fortunately I voiced my opinion aloud, in the right company...

kathleen murtagh
why?

benjamin melançon
because i just read through that thread

kathleen murtagh
hahahhaa

nah, don't think about it that way

always think of it as opportunities to improve yourself

you're never perfect, so you will always be doing something wrong

benjamin melançon
in principle i agree, but i do not believe that learning the arcanities of CVS count as improving oneself

and yes, arcanities is a word, now

kathleen murtagh
hahaha

I kinda just translated it as "idosyncrasities"

benjamin melançon
i think i was thinking "arcane inanities"

kathleen murtagh
hahaha

yes, that is a good new word for that

benjamin melançon
actually, it's neither the possible need to learn something new nor doing something wrong that makes me want to hide, here. It's the not knowing what to learn or what is right!

kathleen murtagh
do what you think is best

benjamin melançon
until add1sun codifies one way or another in the docs, I'm sticking with what i told you: to hell with head

kathleen murtagh
hehe

benjamin melançon
ok, i'll do #3

I don't want dww to be sad

kathleen murtagh
hahahahaha

So here's the new procedure, from dww's summary... take a deep breath...

Option #3 "Always work in a self-documenting branch, but always sync to HEAD for 1 revision before you make new branches going forward".

Making a new branch for 6.x-2.x-dev:

- % cvs export -d 6.x-1 -r DRUPAL-6--1 contributions/modules/foo # Get a "6.x-1" directory tree with no CVS dirs
- % cvs co -d head contributions/modules/foo # Get a clean HEAD workspace in a dir called "head"
- % cp -r 6.x-1/* head # clobber all the files from HEAD with the latest copies from DRUPAL-6--1
- % cd head
- % cvs diff -up # always run this before committing. ;)
- % cvs commit -m "Syncing HEAD with the latest code from DRUPAL-6--1"
- % cvs tag -b DRUPAL-6--2 # make a new branch from the end of HEAD for 6.x-2.*
- create a new release node pointing at DRUPAL-6--2 which will automatically be called 6.x-2.x-dev.

NOTE: Before the cvs commit there should be a cvs status to see if any files are not tracked yet. Be sure to cvs add any new files.