Commit 2dd39f52 authored by unknown's avatar unknown
Browse files

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

into  rolltop.ignatz42.dyndns.org:/mnt/storeage/mysql-5.0-maint


BitKeeper/etc/ignore:
  auto-union
parents 550b2956 e90f2c4f

.bzrignore

+17 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
*.bb

*.bbg

*.bin

*.cmake

*.core

*.d

*.da
@@ -17,6 +18,7 @@ 
*.map

*.o

*.obj

*.old

*.pch

*.pdb

*.reject
@@ -25,11 +27,21 @@ 
*.so

*.so.*

*.spec

*.user

*.vcproj

*/*.dir/*

*/*_pure_*warnings

*/.pure

*/debug/*

*/release/*

*~

.*.swp

./CMakeCache.txt

./MySql.ncb

./MySql.sln

./MySql.suo

./README.build-files

./cmakecache.txt

./config.h

./copy_mysql_files.bat

./fix-project-files
@@ -65,6 +77,7 @@ BitKeeper/post-commit-manual 
BitKeeper/tmp/*

BitKeeper/tmp/bkr3sAHD

BitKeeper/tmp/gone

CMakeFiles/*

COPYING

COPYING.LIB

Docs/#manual.texi#
@@ -1195,6 +1208,7 @@ strings/ctype_autoconf.c 
strings/ctype_extra_sources.c

strings/str_test

strings/test_decimal

support-files/*.ini

support-files/MacOSX/Description.plist

support-files/MacOSX/Info.plist

support-files/MacOSX/ReadMe.txt
@@ -1297,5 +1311,8 @@ vio/test-sslserver 
vio/viotest-ssl

vio/viotest-sslconnect.cpp

vio/viotest.cpp

win/configure.data

win/vs71cache.txt

win/vs8cache.txt

zlib/*.ds?

zlib/*.vcproj

BitKeeper/triggers/post-commit

+9 −3
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ COMMITS=commits@lists.mysql.com 
DOCS=docs-commit@mysql.com

LIMIT=10000

VERSION="5.0"

BKROOT=`bk root`



if [ "$REAL_EMAIL" = "" ]

then
@@ -58,7 +59,9 @@ $BH 
EOF

  bk changes -v -r+

  bk cset -r+ -d

 ) | /usr/sbin/sendmail -t

 ) > $BKROOT/BitKeeper/tmp/dev_public.txt



bk sendmail -t < $BKROOT/BitKeeper/tmp/dev_public.txt



#++

# commits@ mail
@@ -82,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 | /usr/sbin/sendmail -t

 ) | bk sed -e ${LIMIT}q > $BKROOT/BitKeeper/tmp/commits.txt



bk sendmail -t < $BKROOT/BitKeeper/tmp/commits.txt



#++

# docs-commit@ mail
@@ -102,7 +107,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

 bk sendmail -t < $BKROOT/BitKeeper/tmp/docs.txt

 fi



else