#!/bin/sh

# Initial checkin
cp bug-1.1 bug
cvs add bug
cvs commit -m"Initial checkin" bug

# Make a branch tag
cvs tag -b branch bug

# Update the file on the trunk
cp bug-1.2 bug
cvs commit -m"Changed on the trunk" bug

# Update the file on the branch
cvs update -r branch bug
cp bug-1.1.2.1 bug
cvs commit -m"Changed on the branch" bug

# Go back to the trunk, and merge the branch into the trunk
cvs update -A bug
cvs update -jbranch bug
