diff options
| author | unknown <lars@mysql.com/black.(none)> | 2006-11-13 17:54:01 +0100 |
|---|---|---|
| committer | unknown <lars@mysql.com/black.(none)> | 2006-11-13 17:54:01 +0100 |
| commit | 6f276969fc923dfebac51b4413fec0aad1ae7bde (patch) | |
| tree | eb8d5b16379b7f3f8441562d0056a1f68808395e /BitKeeper | |
| parent | 7ca151b591184fa3c7b2eec15c08fa9923b04557 (diff) | |
| parent | 0ce4e1073d1f3ba2771ab9e5255d43ae1184ee78 (diff) | |
| download | mariadb-git-6f276969fc923dfebac51b4413fec0aad1ae7bde.tar.gz | |
Merge mysql.com:/home/bk/MERGE/mysql-4.1-merge
into mysql.com:/home/bk/MERGE/mysql-5.0-merge
BitKeeper/triggers/post-commit:
Auto merged
mysql-test/t/func_gconcat.test:
Auto merged
sql/item_sum.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/log_event.h:
Manual merge
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 981b55c66ec..8051cf98b7a 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 |