fun with CVS branching