freebsd-skq/crypto/openssh/FREEBSD-tricks

# $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=.
Some tricks I use when I upgrade. 2002-10-29 09:56:16 +00:00			`# $FreeBSD$`

			`# Shell code to remove FreeBSD tags before merging`
fine-tune. 2005-09-03 06:42:11 +00:00			`grep -rl '\$Fre[e]BSD:' . \| grep -v FREEBSD >tags`
Fix broken shell code. 2003-09-19 11:29:51 +00:00			`cat tags \| while read f ; do`
Rewrite some of the regexps so they don't match themselves. 2005-06-04 23:18:33 +00:00			`sed -i.orig -e '/\$Fre[e]BSD:/d' $f`
Some tricks I use when I upgrade. 2002-10-29 09:56:16 +00:00			`done`

			`# Shell + Perl code to add FreeBSD tags wherever an OpenBSD or Id tag occurs`
Improvements to the proposed shell code. 2003-04-23 17:21:55 +00:00			`cat tags \|`
fine-tune. 2005-09-03 06:42:11 +00:00			`xargs perl -n -i.orig -e 'print; s/\$(Id\|OpenBSD): [^\$]*/\$FreeBSD/ && print'`
Some tricks I use when I upgrade. 2002-10-29 09:56:16 +00:00
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			`# Diff against vendor branch`
			`svn diff --no-diff-deleted --old=$FSVN/vendor-crypto/openssh/dist/ --new=.`