Merge

From EgeeWiki

#! /bin/sh

# branch
cvs update -dP
cvs diff -u
cvs diff -u -r merge_313_2_branch_src
cvs tag merge_313_3_src
cvs status build.xml | grep branch_ #==> TAG

# head
cvs update -dP
cvs diff -u
cvs tag merge_31_head_dst
cvs update -kk [-j predchozi src] -j $TAG
...
cvs ci -m"merge"
cvs tag merge_31_head_after