summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
Diffstat (limited to 'BitKeeper')
-rw-r--r--BitKeeper/etc/logging_ok2
-rwxr-xr-xBitKeeper/triggers/pre-delta11
2 files changed, 13 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 65255fa6bd3..9e25aca5fa2 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -103,6 +103,7 @@ lenz@mysql.com
magnus@neptunus.(none)
magnus@shellback.(none)
marko@hundin.mysql.fi
+marty@linux.site
mats@mysql.com
matt@booty.(none)
matt@mysql.com
@@ -164,6 +165,7 @@ paul@frost.snake.net
paul@ice.local
paul@ice.snake.net
paul@kite-hub.kitebird.com
+paul@snake-hub.snake.net
paul@teton.kitebird.com
pekka@mysql.com
pem@mysql.com
diff --git a/BitKeeper/triggers/pre-delta b/BitKeeper/triggers/pre-delta
index e22ae9ce940..cd861703bb5 100755
--- a/BitKeeper/triggers/pre-delta
+++ b/BitKeeper/triggers/pre-delta
@@ -1,5 +1,16 @@
#!/bin/sh
+if [ "$BK_USER" = "Administrator" -o "$BK_USER" = "mysqldev" ]
+then
+ echo "Error: you cannot checkin as 'Administrator' or 'mysqldev' user."
+ echo "as a workaround set BK_USER to your nickname"
+ echo "e.g.: export BK_USER='bar'"
+ echo ""
+ echo "Checkin FAILED!"
+ echo "Set BK_USER and retry."
+ exit 1
+fi
+
if [ `tail -c1 $BK_FILE` ]
then
echo "File $BK_FILE does not end with a new-line character!"