summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorjperkin/jonathan@chorlton.adsl.perkin.org.uk <>2007-12-14 16:02:31 +0000
committerjperkin/jonathan@chorlton.adsl.perkin.org.uk <>2007-12-14 16:02:31 +0000
commit8105bd467b3619a3492b9dc414494e32e131e892 (patch)
tree5fd3e58ade5ba17eca3fffc4519f2ec2615a1c9a /BitKeeper
parent3a6b30527be2773330aa8172fff9b9069998b8a4 (diff)
parent2a404c23ba408f6369caf016e2c277988045f7f2 (diff)
downloadmariadb-git-8105bd467b3619a3492b9dc414494e32e131e892.tar.gz
Merge chorlton.adsl.perkin.org.uk:/Users/jonathan/work/bk/mysql-5.0
into chorlton.adsl.perkin.org.uk:/Users/jonathan/work/bk/mysql-5.1
Diffstat (limited to 'BitKeeper')
-rwxr-xr-xBitKeeper/triggers/post-commit12
1 files changed, 9 insertions, 3 deletions
diff --git a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit
index 8376b9e0631..c3a61ed2dde 100755
--- a/BitKeeper/triggers/post-commit
+++ b/BitKeeper/triggers/post-commit
@@ -1,7 +1,13 @@
#!/bin/sh
#shift
-FROM=$USER@mysql.com
+if [ -n "$BK_USER" ]
+then
+ COMMITTER=$BK_USER
+else
+ COMMITTER=$USER
+fi
+FROM=$COMMITTER@mysql.com
COMMITS=commits@lists.mysql.com
DOCS=docs-commit@mysql.com
LIMIT=10000
@@ -88,8 +94,8 @@ Subject: bk commit into $VERSION tree ($CHANGESET)$BS
X-CSetKey: <$CSETKEY>
$BH
Below is the list of changes that have just been committed into a local
-$VERSION repository of $USER. When $USER does a push these changes will
-be propagated to the main repository and, within 24 hours after the
+$VERSION repository of $COMMITTER. When $COMMITTER does a push these changes
+will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html