diff options
| author | unknown <bell@51.0.168.192.in-addr.arpa> | 2005-02-20 18:49:27 +0200 |
|---|---|---|
| committer | unknown <bell@51.0.168.192.in-addr.arpa> | 2005-02-20 18:49:27 +0200 |
| commit | ed7ad40523ad890c9229ce4dd32dc48bba196eac (patch) | |
| tree | ef69852c850b3445152229f7707b70a1601e70c1 /BitKeeper | |
| parent | 5f0064f927aeb897adfc34dd3e739dbaad887482 (diff) | |
| parent | da4604f9e8fa42c8e7c5627b692e0ac6d5409802 (diff) | |
| download | mariadb-git-ed7ad40523ad890c9229ce4dd32dc48bba196eac.tar.gz | |
Merge
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/protocol.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
tests/mysql_client_test.c:
Auto merged
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 4 | ||||
| -rwxr-xr-x | BitKeeper/triggers/post-commit | 27 |
2 files changed, 24 insertions, 7 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index e519dbb1de2..f5cb190ec8d 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -27,6 +27,7 @@ bar@deer.(none) bar@gw.udmsearch.izhnet.ru bar@mysql.com bar@noter.intranet.mysql.r18.ru +bell@51.0.168.192.in-addr.arpa bell@laptop.sanja.is.com.ua bell@sanja.is.com.ua bk@admin.bk @@ -38,6 +39,7 @@ brian@zim.(none) carsten@tsort.bitbybit.dk cps@silver_beast.(none) davida@isil.mysql.com +dean@mysql.com dellis@goetia.(none) dlenev@brandersnatch.localdomain dlenev@build.mysql.com @@ -154,6 +156,7 @@ mronstrom@mysql.com mskold@bk-internal.mysql.com mskold@mysql.com msvensson@build.mysql.com +msvensson@neptunus.(none) msvensson@neptunus.homeip.net mwagner@cash.mwagner.org mwagner@evoq.mwagner.org @@ -222,6 +225,7 @@ serg@sergbook.mysql.com sergefp@mysql.com sinisa@rhols221.adsl.netsonic.fi stewart@mysql.com +svoj@mysql.com tfr@beta.frontier86.ee tfr@indrek.tfr.cafe.ee tfr@sarvik.tfr.cafe.ee diff --git a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit index b2e982761db..d19c724268c 100755 --- a/BitKeeper/triggers/post-commit +++ b/BitKeeper/triggers/post-commit @@ -19,15 +19,28 @@ BK_STATUS=$BK_STATUS$BK_COMMIT if [ "$BK_STATUS" = OK ] then +HAS_ACTUAL_CHANGES=`bk cset -r+ -d | grep -v "^#"` +if [ "$HAS_ACTUAL_CHANGES" = "" ] +then + echo ChangeSet had no real changes, not sending emails + exit +fi + CHANGESET=`bk -R prs -r+ -h -d':P:::I:' ChangeSet` -BUG=`bk -R prs -r+ -h -d':C:' ChangeSet | sed -ne 's/^.*[Bb][Uu][Gg] *# *\([0-9][0-9]*\).*$/ BUG#\1/p'` +BUG=`bk -R prs -r+ -h -d':C:' ChangeSet | sed -ne 's/^.*[Bb][Uu][Gg] *# *\([0-9][0-9]*\).*$/\1/p'` WL=`bk -R prs -r+ -h -d':C:' ChangeSet | sed -ne 's/^.*[Ww][Ll] *# *\([0-9][0-9]*\).*$/ WL#\1/p'` if [ "$BUG" = "" ] then TO=dev-public@mysql.com + BS="" + BH="" else TO=dev-bugs@mysql.com + BS=" BUG#$BUG" +# need newline here + BH="X-Bug: $BUG +" fi #++ # dev-public@ / dev-bugs@ @@ -38,8 +51,8 @@ fi List-ID: <bk.mysql-$VERSION> From: $FROM To: $TO -Subject: bk commit - $VERSION tree ($CHANGESET)${BUG}${WL} - +Subject: bk commit - $VERSION tree ($CHANGESET)${BS}${WL} +$BH EOF bk changes -v -r+ bk cset -r+ -d @@ -54,14 +67,14 @@ EOF List-ID: <bk.mysql-$VERSION> From: $FROM To: $INTERNALS -Subject: bk commit into $VERSION tree ($CHANGESET) - +Subject: bk commit into $VERSION tree ($CHANGESET)$BS +$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 push, to the public repository. For information on how to access the public repository -see http://www.mysql.com/doc/I/n/Installing_source_tree.html +see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html EOF bk changes -v -r+ @@ -81,7 +94,7 @@ EOF List-ID: <bk.mysql-$VERSION> From: $FROM To: $DOCS -Subject: bk commit - $VERSION tree (Manual) ($CHANGESET) +Subject: bk commit - $VERSION tree (Manual) ($CHANGESET)$BS EOF bk changes -v -r+ |