Merge bk-internal.mysql.com:/home/bk/mysql-4.1

into mashka.mysql.fi:/home/my/mysql-4.1

netware/BUILD/apply-patch

+#! /bin/sh
+
+# debug
+#set -x
+
+# stop on errors
+set -e
+
+# repository directory
+repo_dir=`pwd`
+
+# show usage
+show_usage()
+{
+	cat << EOF
+
+usage: apply-patch
+
+Imports netware/current-changes.patch so that current changes
+for the platform are present on the local repository.
+
+Use from the root directory of the repository, with BitKeeper
+installed.
+
+EOF
+	exit 0;
+}
+
+if test $1 || test -z $BK_USER
+then
+	show_usage
+fi
+
+echo "starting patch..."
+
+echo "user: $BK_USER"
+
+# import patch
+# Note: In future this should be changed to check whether
+#       the repo already has this patch
+bk import -tpatch $repo_dir/netware/current-changes.patch $repo_dir

netware/BUILD/save-patch

+#! /bin/sh
+
+# debug
+#set -x
+
+# stop on errors
+set -e
+
+# repository directory
+repo_dir=`pwd`
+
+# show usage
+show_usage()
+{
+	cat << EOF
+
+usage: save-patch
+
+Creates a patch file between the latest revision of the current tree
+and the latest revision not created by \$BK_USER and places it in
+the tree as netware/current-changes.patch
+
+EOF
+	exit 0;
+}
+
+if test $1 || test -z $BK_USER
+then
+	show_usage
+fi
+
+echo "starting patch..."
+
+echo "user: $BK_USER"
+
+# check for bk and repo_dir
+bk help > /dev/null
+repo_dir=`bk root $repo_dir`
+cd $repo_dir
+
+# determine version
+version=`grep -e "AM_INIT_AUTOMAKE(mysql, .*)" < configure.in | sed -e "s/AM_INIT_AUTOMAKE(mysql, \(.*\))/\1/"`
+echo "version: $version"
+
+# user revision
+user_rev=`bk changes -e -n -d':REV:' | head -1`
+echo "latest revision: $user_rev"
+
+# tree revision
+tree_rev=`bk changes -e -n -d':REV:' -U$BK_USER | head -1`
+echo "latest non-$BK_USER revision: $tree_rev"
+
+# create patch
+patch="$repo_dir/netware/current-changes.patch"
+echo "creating \"$patch\"..."
+bk export -tpatch -r$tree_rev..$user_rev -xnetware/current-changes.patch > $patch