diff options
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/collapsed | 3 | ||||
| -rw-r--r-- | BitKeeper/etc/gone | 4 | ||||
| -rw-r--r-- | BitKeeper/etc/logging_ok | 3 | ||||
| -rwxr-xr-x | BitKeeper/triggers/post-commit | 14 | ||||
| -rwxr-xr-x | BitKeeper/triggers/pre-commit | 1 |
5 files changed, 20 insertions, 5 deletions
diff --git a/BitKeeper/etc/collapsed b/BitKeeper/etc/collapsed index 8dcf561b845..842482e46d5 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -29,6 +29,9 @@ 4554a95d7txO1DuO9G3nAizI3SkFAA 4554b3722d71SbPiI2Gx-RhbZjmuIQ 4558b3d73Cxjlb7Wv1oytdSTthxDfw +4561b2ecZbhuAc0TTDdCdultxUYaMw +4561bde4qWhz1I8tkItXKex5uniipA +4562ba016dYH0JzszOqZ8p6psbKfnQ 45771031yRCoM_ZfONdYchPvVEgLRg 459a60d8rIxeTuhB3j_QsOwLGdcpng 459a61c9OS8PzIsdviZJDkybJ1y1uA diff --git a/BitKeeper/etc/gone b/BitKeeper/etc/gone index dc7d1c2d315..5bf77a89052 100644 --- a/BitKeeper/etc/gone +++ b/BitKeeper/etc/gone @@ -456,6 +456,8 @@ arjen@fred.bitbike.com|scripts/mysql_fix_extensions.sh|20020516001337|12363|f104 ccarkner@nslinuxw10.bedford.progress.com|mysql-test/r/isolation.result|20010327145543|25059|4da11e109a3d93a9 ccarkner@nslinuxw10.bedford.progress.com|mysql-test/t/isolation.test|20010327145543|39049|6a39e4138dd4a456 fs +holyfoot/hf@mysql.com/deer.(none)|mysql-test/r/bdb_notembedded.result|20061113160642|60022|276fa5181da9a588 +holyfoot/hf@mysql.com/deer.(none)|mysql-test/t/bdb_notembedded.test|20061113160642|06094|6ef2ea4713496614 jani@a88-113-38-195.elisa-laajakaista.fi|BUILD/SETUP.sh.rej|20070122013357|30052|b0650da46e7c4e54 jani@a88-113-38-195.elisa-laajakaista.fi|configure.in.rej|20070122013357|43533|4b7ec608b9c90e83 jani@a88-113-38-195.elisa-laajakaista.fi|include/my_global.h.rej|20070122013357|29911|dc7f1642f6061af @@ -1190,9 +1192,11 @@ mwagner@evoq.home.mwagner.org|mysql-test/xml/xsl/README|20001013051514|26509|cd4 mwagner@evoq.home.mwagner.org|mysql-test/xml/xsl/mysqltest.xsl|20001013051514|27425|1b8f6ec4f1b5f634 mwagner@work.mysql.com|mysql-test/r/3.23/sel000001.result|20001010091454|28284|383913ae4505ec86 mwagner@work.mysql.com|mysql-test/r/3.23/sel000002.result|20001010091454|29230|d1787e6fd5dbc1cc +mysql-test/t/reserved_win_names-master.opt ndb/src/client/Makefile nick@nick.leippe.com|mysql-test/r/rpl_empty_master_crash.result|20020531235552|47718|615f521be2132141 nick@nick.leippe.com|mysql-test/t/rpl_empty_master_crash.test|20020531235552|52328|99464e737639ccc6 +reggie@mdk10.(none)|BitKeeper/deleted/.del-reserved_win_names-master.opt~e56da049a7ce9a5b|20050523193219|41081 reggie@mdk10.(none)|mysql-test/t/reserved_win_names-master.opt|20050520210356|14878|e56da049a7ce9a5b sasha@mysql.sashanet.com|BitKeeper/etc/logging_ok|20000801000905|12967|5b7d847a2158554 sasha@mysql.sashanet.com|build-tags|20011125054855|05181|7afb7e785b80f97 diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index e9cc35b4c7e..416ab8dbbde 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -18,6 +18,7 @@ antony@ltantony.dsl-verizon.net antony@ltantony.mysql.com antony@ltantony.rdg.cyberkinetica.com antony@ltantony.rdg.cyberkinetica.homeunix.net +antony@ltantony.xiphis.org arjen@bitbike.com arjen@co3064164-a.bitbike.com arjen@fred.bitbike.com @@ -139,6 +140,7 @@ magnus@msdesk.mysql.com magnus@neptunus.(none) magnus@shellback.(none) marko@hundin.mysql.fi +marty@flipper.bredbandsbolaget.se marty@linux.site marty@shark. mats@mysql.com @@ -208,6 +210,7 @@ papa@gbichot.local patg@krsna. patg@krsna.patg.net patg@patrick-galbraiths-computer.local +patg@patrick.local patg@pc248.lfp.kcls.org patg@radha.local paul@central.snake.net diff --git a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit index 865d7cdac92..c3a61ed2dde 100755 --- a/BitKeeper/triggers/post-commit +++ b/BitKeeper/triggers/post-commit @@ -1,11 +1,17 @@ #!/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 -VERSION="5.0" +VERSION="5.1" BKROOT=`bk root` if [ -x /usr/sbin/sendmail ]; then @@ -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 diff --git a/BitKeeper/triggers/pre-commit b/BitKeeper/triggers/pre-commit index 524321e8b80..f4664ccf1fe 100755 --- a/BitKeeper/triggers/pre-commit +++ b/BitKeeper/triggers/pre-commit @@ -20,4 +20,3 @@ then echo "Set REAL_EMAIL and retry." exit 1 fi - |