diff options
author | unknown <pem@mysql.com> | 2002-11-19 18:41:47 +0100 |
---|---|---|
committer | unknown <pem@mysql.com> | 2002-11-19 18:41:47 +0100 |
commit | 558eea5c4d463207c408f0a23edf75dcdc7fcf5a (patch) | |
tree | bd8ef6512a497ac58c5e73ab64c383bff3db5c13 /BitKeeper | |
parent | 2f639e57a4b1ac24c72b4e788e160d4a8930cfde (diff) | |
parent | b76c803ab9a655b98c4cc561709c7e61b33f98e5 (diff) | |
download | mariadb-git-558eea5c4d463207c408f0a23edf75dcdc7fcf5a.tar.gz |
Merged 4.1 into 5.0.
BitKeeper/etc/gone:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-skipkeys~98ee606e6b0fe965:
'Auto converge rename'
configure.in:
Auto merged
sql/sql_yacc.yy:
Manually merged.
Diffstat (limited to 'BitKeeper')
-rwxr-xr-x | BitKeeper/triggers/post-commit | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit index f8ab599fc98..52d4a1e247f 100755 --- a/BitKeeper/triggers/post-commit +++ b/BitKeeper/triggers/post-commit @@ -6,6 +6,7 @@ FROM=$USER@mysql.com INTERNALS=internals@lists.mysql.com DOCS=docs-commit@mysql.com LIMIT=10000 +REPOV=5.0 if [ "$REAL_EMAIL" = "" ] then @@ -25,15 +26,15 @@ then echo "Commit successful, notifying developers at $TO" ( cat <<EOF -List-ID: <bk.mysql-4.1> +List-ID: <bk.mysql-$REPOV> From: $FROM To: $TO -Subject: bk commit - 4.1 tree +Subject: bk commit - $REPOV tree EOF bk changes -v -r+ bk cset -r+ -d - ) | head -n $LIMIT | /usr/sbin/sendmail -t + ) | /usr/sbin/sendmail -t #++ # internals@ mail @@ -41,13 +42,13 @@ EOF echo "Notifying internals list at $INTERNALS" ( cat <<EOF -List-ID: <bk.mysql-4.1> +List-ID: <bk.mysql-$REPOV> From: $FROM To: $INTERNALS -Subject: bk commit into 4.1 tree +Subject: bk commit into $REPOV tree Below is the list of changes that have just been committed into a local -4.1 repository of $USER. When $USER does a push these changes will +$REPOV 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 @@ -68,15 +69,15 @@ EOF echo "Notifying docs list at $DOCS" ( cat <<EOF -List-ID: <bk.mysql-4.1> +List-ID: <bk.mysql-$REPOV> From: $FROM To: $DOCS -Subject: bk commit - 4.1 tree (Manual) +Subject: bk commit - $REPOV tree (Manual) EOF bk changes -v -r+ bk cset -r+ -d - ) | head -n $LIMIT | /usr/sbin/sendmail -t + ) | /usr/sbin/sendmail -t fi else |