6 files changed, 39 insertions, 13 deletions
diff --git a/BitKeeper/etc/config b/BitKeeper/etc/config
index 9df006ac7d5..ea30f368b52 100644
--- a/BitKeeper/etc/config
+++ b/BitKeeper/etc/config
@@ -69,4 +69,5 @@ pager:
 hours: 
 [serg:]checkout:get
 [arjen:]checkout:get
+[nick:]checkout:get
 checkout:edit
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 4c1777f1434..177107f8779 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -4,6 +4,8 @@ Administrator@co3064164-a.rochd1.qld.optushome.com.au
 Administrator@fred.
 Miguel@light.local
 Sinisa@sinisa.nasamreza.org
+WAX@sergbook.mysql.com
+administrador@light.hegel.local
 ahlentz@co3064164-a.rochd1.qld.optusnet.com.au
 akishkin@work.mysql.com
 arjen@co3064164-a.bitbike.com
@@ -11,9 +13,11 @@ arjen@fred.bitbike.com
 arjen@george.bitbike.com
 bar@bar.mysql.r18.ru
 bar@bar.udmsearch.izhnet.ru
+bar@gw.udmsearch.izhnet.ru
 bell@laptop.sanja.is.com.ua
 bell@sanja.is.com.ua
 bk@admin.bk
+bk@mysql.r18.ru
 carsten@tsort.bitbybit.dk
 davida@isil.mysql.com
 dlenev@build.mysql.com
@@ -30,11 +34,15 @@ heikki@donna.mysql.fi
 heikki@hundin.mysql.fi
 heikki@rescue.
 heikki@work.mysql.com
+hf@bison.(none)
+hf@bisonxp.(none)
 hf@deer.(none)
 hf@deer.mysql.r18.ru
 hf@genie.(none)
 igor@hundin.mysql.fi
+igor@rurik.mysql.com
 jani@dsl-jkl1657.dial.inet.fi
+jani@dsl-kpogw4gb5.dial.inet.fi
 jani@hynda.(none)
 jani@hynda.mysql.fi
 jani@janikt.pp.saunalahti.fi
@@ -48,6 +56,7 @@ jcole@sarvik.tfr.cafe.ee
 jcole@tetra.spaceapes.com
 jorge@linux.jorge.mysql.com
 kaj@work.mysql.com
+konstantin@mysql.com
 kostja@oak.local
 lenz@kallisto.mysql.com
 lenz@mysql.com
@@ -75,9 +84,11 @@ monty@work.mysql.com
 mwagner@cash.mwagner.org
 mwagner@evoq.mwagner.org
 mwagner@work.mysql.com
+mysql@home.(none)
 mysqldev@build.mysql2.com
 nick@mysql.com
 nick@nick.leippe.com
+papa@gbichot.local
 paul@central.snake.net
 paul@ice.local
 paul@ice.snake.net
@@ -88,10 +99,13 @@ peter@mysql.com
 peterg@mysql.com
 pgulutzan@linux.local
 ram@gw.mysql.r18.ru
+ram@gw.udmsearch.izhnet.ru
 ram@mysql.r18.ru
 ram@ram.(none)
 ranger@regul.home.lan
+root@home.(none)
 root@x3.internalnet
+salle@banica.(none)
 salle@geopard.(none)
 salle@geopard.online.bg
 sasha@mysql.sashanet.com
@@ -115,13 +129,18 @@ tonu@hundin.mysql.fi
 tonu@volk.internalnet
 tonu@x153.internalnet
 tonu@x3.internalnet
+venu@hundin.mysql.fi
+venu@myvenu.com
 venu@work.mysql.com
 vva@eagle.mysql.r18.ru
 vva@genie.(none)
+vva@mysql.r18.ru
 walrus@kishkin.ru
 walrus@mysql.com
+wax@kishkin.ru
 wax@mysql.com
 worm@altair.is.lan
 zak@balfor.local
 zak@linux.local
+zak@mysql.com
 zgreant@mysql.com
diff --git a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit
index 636e4262693..a2a0ecb2701 100755
--- a/BitKeeper/triggers/post-commit
+++ b/BitKeeper/triggers/post-commit
@@ -27,10 +27,10 @@ CHANGESET=`bk -R prs -r+ -h -d':I:' ChangeSet`
  echo "Commit successful, notifying developers at $TO"
  (
    cat <<EOF
-List-ID: <bk.mysql-4.0>
+List-ID: <bk.mysql-4.1>
 From: $FROM
 To: $TO
-Subject: bk commit - 4.0 tree ($CHANGESET)
+Subject: bk commit - 4.1 tree ($CHANGESET)
 
 EOF
   bk changes -v -r+
@@ -43,13 +43,13 @@ EOF
  echo "Notifying internals list at $INTERNALS"
  (
    cat <<EOF
-List-ID: <bk.mysql-4.0>
+List-ID: <bk.mysql-4.1>
 From: $FROM
 To: $INTERNALS
-Subject: bk commit into 4.0 tree ($CHANGESET)
+Subject: bk commit into 4.1 tree ($CHANGESET)
 
 Below is the list of changes that have just been committed into a local
-4.0 repository of $USER. When $USER does a push these changes will
+4.1 repository of $USER. When $USER 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
@@ -70,10 +70,10 @@ EOF
   echo "Notifying docs list at $DOCS"
   (
     cat <<EOF
-List-ID: <bk.mysql-4.0>
+List-ID: <bk.mysql-4.1>
 From: $FROM
 To: $DOCS
-Subject: bk commit - 4.0 tree (Manual) ($CHANGESET)
+Subject: bk commit - 4.1 tree (Manual) ($CHANGESET)
 
 EOF
   bk changes -v -r+
diff --git a/BitKeeper/triggers/post-incoming b/BitKeeper/triggers/post-incoming
deleted file mode 100755
index f1ea2255de9..00000000000
--- a/BitKeeper/triggers/post-incoming
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-echo "Test: post-incoming works"
diff --git a/BitKeeper/triggers/post-outgoing b/BitKeeper/triggers/post-outgoing
deleted file mode 100755
index 3fc2cdbad67..00000000000
--- a/BitKeeper/triggers/post-outgoing
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-
-echo "Test: post-outgoing works"
diff --git a/BitKeeper/triggers/pre-commit b/BitKeeper/triggers/pre-commit
new file mode 100755
index 00000000000..2293dc55e2a
--- /dev/null
+++ b/BitKeeper/triggers/pre-commit
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+if [ "$REAL_EMAIL" = "" ]
+then
+ echo "Error: you must set REAL_EMAIL in your profile"
+ echo "e.g.: export REAL_EMAIL='Joe Dow <joe@foo.bar>'"
+ echo ""
+ echo "Commit FAILED!"
+ echo "Set REAL_EMAIL and retry."
+ exit 1
+fi
+