diff options
author | unknown <ingo@mysql.com> | 2005-02-11 11:59:35 +0100 |
---|---|---|
committer | unknown <ingo@mysql.com> | 2005-02-11 11:59:35 +0100 |
commit | 72750ad95ac45e12bedce010cf44e14e2c4f63ea (patch) | |
tree | d73fcf1368fb2dea3f7313a842fda03a076166ab /BitKeeper/triggers | |
parent | 6520c161cf4d8f80a7701841e8e94ee53b95f6ed (diff) | |
parent | 53596fa16f4387fa6b0101ab18fb9af24d3163b7 (diff) | |
download | mariadb-git-72750ad95ac45e12bedce010cf44e14e2c4f63ea.tar.gz |
Merge
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/triggers/post-commit:
Auto merged
include/my_pthread.h:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/t/select.test:
Auto merged
sql/item.cc:
Auto merged
sql/log.cc:
Auto merged
sql/table.cc:
SCCS merged
Diffstat (limited to 'BitKeeper/triggers')
-rwxr-xr-x | BitKeeper/triggers/post-commit | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit index b2e982761db..30238c06b93 100755 --- a/BitKeeper/triggers/post-commit +++ b/BitKeeper/triggers/post-commit @@ -20,14 +20,20 @@ if [ "$BK_STATUS" = OK ] then 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 +44,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 +60,15 @@ 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 +88,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+ |