blob: cf7d663e23da3f34aff44bd42d2a17d2506a927a (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
#!/bin/sh
#
# Merge an entire directory from HEAD to a given branch
#
# $FreeBSD$
#
if [ $# -eq 1 -a -f CVS/Tag ] ; then
set -- "${1}" "$(sed -e 's/^T//' <CVS/Tag)"
echo "Assuming branch is $2"
fi
if [ $# -ne 2 ] ; then
echo "usage: mfc <dir> <branch>" 1>&2
exit 1
fi
dir="${1}"
branch="${2}"
set -e
# Get sources from HEAD
/usr/bin/cvs -f -Q up -kk -Pd -A "${dir}"
# Fake a cvs add...
find "${dir}" -type d -name CVS |
while read d ; do
echo "${d%/CVS}"
# Fix up Entries so the files look newly added
sed -E -i'' -e \
"s|^/([^/]+)/.*|/\1/0/Merged \1 from HEAD//T${branch}|" \
"${d}/Entries"
# Set directory tag
echo "T${branch}" >"$d/Tag"
done
|
