cvs merging back changes for openacs from a given branch

gistfile1.sh

# Example using oacs-5-8 branch. 

# tag first the desired branch
cvs checkout -r oacs-5-8 openacs-4
cd openacs-4
cvs tag -F vg-merge-oacs-5-8-date

# you can update the current checkout with
cvs up -A 

# or simple checkout head branch 
cvs checkout openacs-4

#once in a checkout on the head branch do 
cvs up -d -kk -j vg-merge-oacs-5-8-old-date -j vg-merge-oacs-5-8-date
# vg-merge-oacs-5-8-old-date is a tag created if there was already a merge comming from this branch
# if this is the first merge to head, simply use one -j

#in case you want to check which files have been added
cvs up |grep '^A'|awk '{print $2}'

# commit
cvs commit