Merge bk://gkernel.bkbits.net/misc-2.5

into home.osdl.org:/home/torvalds/v2.5/linux

Documentation/BK-usage/00-INDEX

@@ -17,6 +17,14 @@ bz64wrap: helper script. Uncompressed input is piped to this script,
 which compresses its input, and then outputs the uu-/base64-encoded
 version of the compressed input.
 
+cpcset: Copy changeset between unrelated repositories.
+Attempts to preserve changeset user, user address, description, in
+addition to the changeset (the patch) itself.
+Typical usage:
+	cd my-updated-repo
+	bk changes	# looking for a changeset...
+	cpcset 1.1511 . ../another-repo
+
 csets-to-patches: Produces a delta of two BK repositories, in the form
 of individual files, each containing a single cset as a GNU patch.
 Output is several files, each with the filename "/tmp/rev-$REV.patch"
@@ -33,6 +41,11 @@ Typical usage:
 	bk changes -L ~/repo/original-repo 2>&1 | \
 		perl cset-to-linus > summary.txt
 
+gcapatch:  Generates patch containing changes in local repository.
+Typical usage:
+	cd my-updated-repo
+	gcapatch > foo.patch
+
 unbz64wrap: Reverse an encoded, compressed data stream created by
 bz64wrap into an uncompressed, typically text/plain output.
 

Documentation/BK-usage/cpcset

+#!/bin/sh
+#
+# Purpose: Copy changeset patch and description from one
+#	   repository to another, unrelated one.
+#
+# usage:  cpcset [revision] [from-repository] [to-repository]
+#
+
+REV=$1
+FROM=$2
+TO=$3
+TMPF=/tmp/cpcset.$$
+
+rm -f $TMPF*
+
+CWD_SAVE=`pwd`
+cd $FROM
+bk changes -r$REV			|	\
+	grep -v '^ChangeSet'		|	\
+	sed -e 's/^  //g' > $TMPF.log
+
+USERHOST=`bk changes -r$REV | grep '^ChangeSet' | awk '{print $4}'`
+export BK_USER=`echo $USERHOST | awk '-F@' '{print $1}'`
+export BK_HOST=`echo $USERHOST | awk '-F@' '{print $2}'`
+
+bk export -tpatch -hdu -r$REV > $TMPF.patch && \
+cd $CWD_SAVE && \
+cd $TO && \
+bk import -tpatch -CFR -y"`cat $TMPF.log`" $TMPF.patch . && \
+bk commit -y"`cat $TMPF.log`"
+
+rm -f $TMPF*
+
+echo changeset $REV copied.
+echo ""
+

Documentation/BK-usage/gcapatch

+#!/bin/sh
+#
+# Purpose: Generate GNU diff of local changes versus canonical top-of-tree
+#
+# Usage: gcapatch > foo.patch
+#
+
+bk export -tpatch -hdu -r`bk repogca bk://linux.bkbits.net/linux-2.5`,+