summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authordlenev@mockturtle.local <>2006-09-29 10:55:03 +0400
committerdlenev@mockturtle.local <>2006-09-29 10:55:03 +0400
commita4ee7ec15368707f87de30e9bb261491a2a95ff0 (patch)
treed8ead16d04f76d57f33c217ab7782d7f850e10f7 /BitKeeper
parent3b672c9a3c5c3f2b4fb5dd82300f2e022ca6decb (diff)
parent4aaf7e34ff45f084234b007b68fb4e0f892ca625 (diff)
downloadmariadb-git-a4ee7ec15368707f87de30e9bb261491a2a95ff0.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mockturtle.local:/home/dlenev/src/mysql-5.0-rt-merge
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/collapsed1
-rw-r--r--BitKeeper/etc/config1
-rwxr-xr-xBitKeeper/triggers/post-commit18
3 files changed, 17 insertions, 3 deletions
diff --git a/BitKeeper/etc/collapsed b/BitKeeper/etc/collapsed
index 82b3b29742e..bbf04965038 100644
--- a/BitKeeper/etc/collapsed
+++ b/BitKeeper/etc/collapsed
@@ -4,3 +4,4 @@
44f33f3aj5KW5qweQeekY1LU0E9ZCg
45001f7c3b2hhCXDKfUvzkX9TNe6VA
45002051rHJfMEXAIMiAZV0clxvKSA
+4513d8e4Af4dQWuk13sArwofRgFDQw
diff --git a/BitKeeper/etc/config b/BitKeeper/etc/config
index 6d06edd193e..1a027813ff4 100644
--- a/BitKeeper/etc/config
+++ b/BitKeeper/etc/config
@@ -75,5 +75,6 @@ hours:
[tomas:]checkout:get
[guilhem:]checkout:get
[pekka:]checkout:get
+[msvensson:]checkout:get
checkout:edit
eoln:unix
diff --git a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit
index 22d183eae3a..981b55c66ec 100755
--- a/BitKeeper/triggers/post-commit
+++ b/BitKeeper/triggers/post-commit
@@ -6,6 +6,13 @@ COMMITS=commits@lists.mysql.com
DOCS=docs-commit@mysql.com
LIMIT=10000
VERSION="5.0"
+BKROOT=`bk root`
+
+if [ -x /usr/sbin/sendmail ]; then
+ SENDMAIL=/usr/sbin/sendmail
+else
+ SENDMAIL=sendmail
+fi
if [ "$REAL_EMAIL" = "" ]
then
@@ -58,7 +65,9 @@ $BH
EOF
bk changes -v -r+
bk cset -r+ -d
- ) | /usr/sbin/sendmail -t
+ ) > $BKROOT/BitKeeper/tmp/dev_public.txt
+
+$SENDMAIL -t < $BKROOT/BitKeeper/tmp/dev_public.txt
#++
# commits@ mail
@@ -82,7 +91,9 @@ see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
EOF
bk changes -v -r+
bk cset -r+ -d
- ) | head -n $LIMIT | /usr/sbin/sendmail -t
+ ) | bk sed -e ${LIMIT}q > $BKROOT/BitKeeper/tmp/commits.txt
+
+$SENDMAIL -t < $BKROOT/BitKeeper/tmp/commits.txt
#++
# docs-commit@ mail
@@ -102,7 +113,8 @@ Subject: bk commit - $VERSION tree (Manual) ($CHANGESET)$BS
EOF
bk changes -v -r+
bk cset -r+ -d
- ) | /usr/sbin/sendmail -t
+ ) > $BKROOT/BitKeeper/tmp/docs.txt
+ $SENDMAIL -t < $BKROOT/BitKeeper/tmp/docs.txt
fi
else