diff options
| author | unknown <lars@black.(none)> | 2006-11-13 17:59:51 +0100 |
|---|---|---|
| committer | unknown <lars@black.(none)> | 2006-11-13 17:59:51 +0100 |
| commit | 739a76139996fda28327e1c14ee3d1f84d058e3a (patch) | |
| tree | 9f6171a763f05acb8727a53ab3ed06c6e5a5bd6c /BitKeeper | |
| parent | 173d093a2bbbdae62da8c28460f60319e1f3b70a (diff) | |
| parent | 1613ad2c9836f83d366ca9d6d3aaff741262842c (diff) | |
| download | mariadb-git-739a76139996fda28327e1c14ee3d1f84d058e3a.tar.gz | |
Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge
into mysql.com:/home/bk/MERGE/mysql-5.1-merge
BitKeeper/triggers/post-commit:
Auto merged
mysql-test/t/func_gconcat.test:
Auto merged
sql/item_sum.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/slave.cc:
Manual merge
Diffstat (limited to 'BitKeeper')
| -rwxr-xr-x | BitKeeper/triggers/post-commit | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit index f7b00625264..86f3db012ee 100755 --- a/BitKeeper/triggers/post-commit +++ b/BitKeeper/triggers/post-commit @@ -35,9 +35,17 @@ fi CHANGESET=`bk -R prs -r+ -h -d':P:::I:' ChangeSet` CSETKEY=`bk -R prs -r+ -h -d':KEY:' ChangeSet` -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'` - +# +# composing subject lines of commit mails. +# if a fix targets to a WL and there is a bug referred +# then X-Bug mail header will contain the first found bug's number +# +BUG=`bk -R prs -r+ -h -d':C:' ChangeSet | \ + sed -ne 's/[Bb][Uu][Gg] *# *\([0-9][0-9]*\).*$/BUG#\1/ + s/.*BUG#\([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/ + s/.*\(WL#[0-9][0-9]*\)/ \1/p'` if [ "$BUG" = "" ] then TO=dev-public@mysql.com |