From 2e95c0f49a7863a1df2d219b45a1af2f1ddbae3b Mon Sep 17 00:00:00 2001
From: "lenz@mysql.com" <>
Date: Mon, 3 Jan 2005 21:28:14 +0100
Subject: [PATCH] - Updated Bootstrap to include merge ChangeSets in the source
 distribution's   ChangeLog, too (to be more exact when tagging a release
 that's based on a   merge ChangeSet)

---
 Build-tools/Bootstrap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Build-tools/Bootstrap b/Build-tools/Bootstrap
index fc36c51ec85..10211dbb59c 100755
--- a/Build-tools/Bootstrap
+++ b/Build-tools/Bootstrap
@@ -252,7 +252,7 @@ if (defined $opt_changelog)
 	$msg= "Adding $target_dir/ChangeLog";
 	$msg.= " (down to revision $opt_changelog)" if $opt_changelog ne "";
 	&logger($msg);
-	$command= "bk changes -mv";
+	$command= "bk changes -v";
 	$command.= " -r" if ($opt_changelog ne "" || $opt_revision);
 	$command.= $opt_changelog if $opt_changelog ne "";
 	$command.= ".." if ($opt_changelog ne "" && !$opt_revision);