diff options
| author | unknown <df@pippilotta.erinye.com> | 2007-06-18 20:15:27 +0200 |
|---|---|---|
| committer | unknown <df@pippilotta.erinye.com> | 2007-06-18 20:15:27 +0200 |
| commit | 9273b0b25ecde3d78583521267b67371075ab0b2 (patch) | |
| tree | 739e8030180ed74f6ef883d630378a3f989daa80 /BitKeeper | |
| parent | 2552a16ee44d094395776d0381b54ef1df589a49 (diff) | |
| parent | 496e3aa59347d8ee3d1adfa11daf6e9674666131 (diff) | |
| download | mariadb-git-9273b0b25ecde3d78583521267b67371075ab0b2.tar.gz | |
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
BitKeeper/triggers/post-commit:
Auto merged
Diffstat (limited to 'BitKeeper')
| -rwxr-xr-x | BitKeeper/triggers/post-commit | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit index d8fabe59bba..865d7cdac92 100755 --- a/BitKeeper/triggers/post-commit +++ b/BitKeeper/triggers/post-commit @@ -96,7 +96,7 @@ see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html EOF bk changes -v -r+ - bk cset -r+ -d + bk rset -r+ -ah | bk gnupatch -h -dup -T ) | bk sed -e ${LIMIT}q > $BKROOT/BitKeeper/tmp/commits.txt $SENDMAIL -t < $BKROOT/BitKeeper/tmp/commits.txt @@ -118,7 +118,7 @@ Subject: bk commit - $VERSION tree (Manual) ($CHANGESET)$BS EOF bk changes -v -r+ - bk cset -r+ -d + bk rset -r+ -ah | bk gnupatch -h -dup -T ) > $BKROOT/BitKeeper/tmp/docs.txt $SENDMAIL -t < $BKROOT/BitKeeper/tmp/docs.txt fi |