diff options
| author | msvensson@neptunus.(none) <> | 2006-11-28 20:59:57 +0100 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2006-11-28 20:59:57 +0100 |
| commit | 04d5a42bbfb36e614512d692a34130242d345175 (patch) | |
| tree | abd103946cab0eae83e36388b799bb0e86227ee3 /BitKeeper | |
| parent | cc2821944fcceb54080230acb057c627a5c288ed (diff) | |
| parent | 648e86e10849f5d31c9592d6173ac8f1c2b453aa (diff) | |
| download | mariadb-git-04d5a42bbfb36e614512d692a34130242d345175.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/collapsed | 2 | ||||
| -rwxr-xr-x | BitKeeper/triggers/post-commit | 14 |
2 files changed, 13 insertions, 3 deletions
diff --git a/BitKeeper/etc/collapsed b/BitKeeper/etc/collapsed index 2509fa50a7b..5ff033b2163 100644 --- a/BitKeeper/etc/collapsed +++ b/BitKeeper/etc/collapsed @@ -15,6 +15,8 @@ 45214442pBGT9KuZEGixBH71jTzbOA 45214a07hVsIGwvwa-WrO-jpeaSwVw 452a92d0-31-8wSzSfZi165fcGcXPA +452c6c6dAjuNghfc1ObZ_UQ5SCl85g +4538a7b0EbDHHkWPbIwxO6ZIDdg6Dg 454a7ef8gdvE_ddMlJyghvOAkKPNOQ 454bb488ijVLOUK_GFjcoISE0GxPUA 454bb9a8AwlGRC_wWLS2sNMoRBMRGw 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 |