[Python-Dev] Switch to 2.4a0 on trunk?

Martin v. L÷wis martin@v.loewis.de
01 Aug 2003 09:37:06 +0200

Barry Warsaw <barry@python.org> writes:

> Well, here's the problem.  The branch was already created with
> release23-branch, and there doesn't appear to be a way to rename a
> branch tag.  Fred's going to dig into the docs to see if he can find a
> clue, but if anybody else has direct experience with renaming branch
> tags, please speak up!

I fail to see the problem. Python 2.2 also has release22-fork (a tag),
release22-branch (a branch), release22-maint (a branch), and release22
(a tag). I don't know whether this was intentional or not, but I would
interpret it this way:

- release22-fork: Point where release procedure for 2.2 started
- release22-branch: Branch on which 2.2.0 was developed
- release22: the actual release
- release22-maint: Maintenance (2.2.1, etc)

I suggest to do the same for 2.3, i.e.

cvs co -r release23-fork
cvs tag -b release23-maint

You will then need to merge the changes from release23-branch to
release23-maint, which, I believe, is done by

cvs co -r release23-maint
cvs up -j release23-branch
cvs commit

In the future, I recommend to drop the release branch
altogether. Instead, when RC1 is going to be released, create a -maint
branch, and release RC1 off that, then release RC2, and the final
release also from the -maint branch. Changes made to the -maint branch
must then get forwarded to HEAD manually, but there shouldn't be many.