diff options
| author | unknown <serg@janus.mylan> | 2007-12-27 17:30:59 +0100 |
|---|---|---|
| committer | unknown <serg@janus.mylan> | 2007-12-27 17:30:59 +0100 |
| commit | c1350b873165429f06b061565b91a0d423e39bdb (patch) | |
| tree | 6fb6953a69411105f5728d3577d344f246f280fe /BitKeeper | |
| parent | cd7b1fd9eb325f7af88f825cf1f00a15d005645c (diff) | |
| parent | c8f6457f650845ab1f9e04b2136b8351e4d465aa (diff) | |
| download | mariadb-git-c1350b873165429f06b061565b91a0d423e39bdb.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
BitKeeper/triggers/post-commit:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'BitKeeper')
| -rwxr-xr-x | BitKeeper/triggers/post-commit | 12 |
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 |