summaryrefslogtreecommitdiff
path: root/BitKeeper
diff options
context:
space:
mode:
authorunknown <df@pippilotta.erinye.com>2007-06-18 20:18:32 +0200
committerunknown <df@pippilotta.erinye.com>2007-06-18 20:18:32 +0200
commit14d22cfc80af05d5a6f4892698c96b3f0fb7d51d (patch)
tree82169abe3173616927eb68003af73bf88149a97d /BitKeeper
parentd38d29c363f6d783f22528fd2befa9543e06c4e9 (diff)
parent9273b0b25ecde3d78583521267b67371075ab0b2 (diff)
downloadmariadb-git-14d22cfc80af05d5a6f4892698c96b3f0fb7d51d.tar.gz
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build BitKeeper/triggers/post-commit: Auto merged
Diffstat (limited to 'BitKeeper')
-rwxr-xr-xBitKeeper/triggers/post-commit4
1 files changed, 2 insertions, 2 deletions
diff --git a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit
index 8287405b1ba..8376b9e0631 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