Commit 2e95c0f4 authored by lenz@mysql.com's avatar lenz@mysql.com

- 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)
parent b8cbe63b
...@@ -252,7 +252,7 @@ if (defined $opt_changelog) ...@@ -252,7 +252,7 @@ if (defined $opt_changelog)
$msg= "Adding $target_dir/ChangeLog"; $msg= "Adding $target_dir/ChangeLog";
$msg.= " (down to revision $opt_changelog)" if $opt_changelog ne ""; $msg.= " (down to revision $opt_changelog)" if $opt_changelog ne "";
&logger($msg); &logger($msg);
$command= "bk changes -mv"; $command= "bk changes -v";
$command.= " -r" if ($opt_changelog ne "" || $opt_revision); $command.= " -r" if ($opt_changelog ne "" || $opt_revision);
$command.= $opt_changelog if $opt_changelog ne ""; $command.= $opt_changelog if $opt_changelog ne "";
$command.= ".." if ($opt_changelog ne "" && !$opt_revision); $command.= ".." if ($opt_changelog ne "" && !$opt_revision);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment