3 # Merge an entire directory from HEAD to a given branch
8 if [ $# -eq 1 -a -f CVS/Tag ] ; then
9 set -- "${1}" "$(sed -e 's/^T//' <CVS/Tag)"
10 echo "Assuming branch is $2"
13 if [ $# -ne 2 ] ; then
14 echo "usage: mfc <dir> <branch>" 1>&2
23 # Get sources from HEAD
24 /usr/bin/cvs -f -Q up -kk -Pd -A "${dir}"
27 find "${dir}" -type d -name CVS |
31 # Fix up Entries so the files look newly added
33 "s|^/([^/]+)/.*|/\1/0/Merged \1 from HEAD//T${branch}|" \
37 echo "T${branch}" >"$d/Tag"