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?