1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my50-winbkfix

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my51-winbkfix


BitKeeper/etc/ignore:
  auto-union
BitKeeper/triggers/post-commit:
  Manual merge.  Opted for the method that uses temp files for improved troubleshooting.
This commit is contained in:
unknown
2006-09-13 14:16:53 -04:00
2 changed files with 26 additions and 9 deletions

View File

@ -6,6 +6,7 @@ COMMITS=commits@lists.mysql.com
DOCS=docs-commit@mysql.com
LIMIT=10000
VERSION="5.1"
BKROOT=`bk root`
if [ "$REAL_EMAIL" = "" ]
then
@ -14,12 +15,6 @@ else
FROM=$REAL_EMAIL
fi
if [ -x /usr/sbin/sendmail ]; then
SENDMAIL=/usr/sbin/sendmail
else
SENDMAIL=sendmail
fi
BK_STATUS=$BK_STATUS$BK_COMMIT
if [ "$BK_STATUS" = OK ]
@ -64,7 +59,9 @@ $BH
EOF
bk changes -v -r+
bk cset -r+ -d
) | $SENDMAIL -t
) > $BKROOT/BitKeeper/tmp/dev_public.txt
bk sendmail -t < $BKROOT/BitKeeper/tmp/dev_public.txt
#++
# commits@ mail
@ -88,7 +85,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 | $SENDMAIL -t
) | bk sed -e ${LIMIT}q > $BKROOT/BitKeeper/tmp/commits.txt
bk sendmail -t < $BKROOT/BitKeeper/tmp/commits.txt
#++
# docs-commit@ mail
@ -108,7 +107,8 @@ Subject: bk commit - $VERSION tree (Manual) ($CHANGESET)$BS
EOF
bk changes -v -r+
bk cset -r+ -d
) | $SENDMAIL -t
) > $BKROOT/BitKeeper/tmp/docs.txt
bk sendmail -t < $BKROOT/BitKeeper/tmp/docs.txt
fi
else