Forum OpenACS Q&A: CVS branches - 4.5 vs. devel (default)

Collapse
1: CVS branches - 4.5 vs. devel (default)
Posted by Don Baccus on 04/02/02 04:18 PM
Just a head-up to those with CVS commit access:

We have two branches, one tagged oacs-4-5 which will become our 4.5
release, and the other untagged, which serves as our development branch.

If you commit a bug fix that you want to be part of our 4.5 release be
sure to check out the oacs-4-5 branch and to commit the bug to that
branch.  Please take care - we only want obvious bug fixes in this
branch, no new development, feature enhancement, or the like.

You don't need to commit it again in the development branch as I'll
merge 4.5 changes into the development (deafult) branch when I cut the
release tarball.

Only commit changes not meant to be part of the 4.5 release to the
development branch.

Thanks!

Collapse
2: Response to CVS branches - 4.5 vs. devel (default) (response to 1)
Posted by Tilmann Singer on 04/03/02 02:55 AM
Suppose someone has by accident committed a bugfix to the development branch, and the output of cvs log now looked like this: 

$ cvs log spam-edit-postgresql.xql 

RCS file: /cvsroot/openacs-4/packages/spam/www/admin/spam-edit-postgresql.xql,v
Working file: spam-edit-postgresql.xql
head: 1.2
branch:
locks: strict
access list:
symbolic names:
	oacs-4-5-beta-1-2: 1.1
	oacs-4-5-beta-1-1: 1.1
	oacs-4-5-beta-1: 1.1
	oacs-4-5: 1.1.0.2
keyword substitution: kv
total revisions: 2;	selected revisions: 2
description:
----------------------------
revision 1.2
date: 2002/03/28 22:54:41;  author: someone;  state: Exp;  lines: +10 -0
----------------------------
revision 1.1
date: 2001/09/04 21:14:59;  author: someone;  state: Exp;

==============================

What would have to be done to move the latest version (1.2) of this file into the oacs-4-5 branch? My guess from reading the cvs manpage is something like this: 

cvs rtag -b -F -r 1.2 oacs-4-5 spam-edit-postgresql.xql

Would that be correct?