freebsd-skq/crypto/openssh/FREEBSD-tricks
des 0a6d19e874 Tag expansion is no longer needed (svn handles them correctly).
Add svn command to diff against vendor branch.
2008-08-01 01:05:27 +00:00

15 lines
461 B
Plaintext

# $FreeBSD$
# Shell code to remove FreeBSD tags before merging
grep -rl '\$Fre[e]BSD:' . | grep -v FREEBSD >tags
cat tags | while read f ; do
sed -i.orig -e '/\$Fre[e]BSD:/d' $f
done
# Shell + Perl code to add FreeBSD tags wherever an OpenBSD or Id tag occurs
cat tags |
xargs perl -n -i.orig -e 'print; s/\$(Id|OpenBSD): [^\$]*/\$FreeBSD/ && print'
# Diff against vendor branch
svn diff --no-diff-deleted --old=$FSVN/vendor-crypto/openssh/dist/ --new=.