<!DOCTYPE html>
<html>
<head>
</head>
<body>
<dl style="line-height: 1.5; margin-left: 2em">
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Author</dt>
<dd style="margin-left: 8.5em">Kouhei Sutou <kou****@clear*****></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Date</dt>
<dd style="margin-left: 8.5em">2014-02-04 13:35:22 +0900 (Tue, 04 Feb 2014)</dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">New Revision</dt>
<dd style="margin-left: 8.5em"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8">5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8</a></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Message</dt>
<dd style="margin-left: 8.5em"><pre style="border: 1px solid #aaa; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; padding: 0.5em; width: auto">Don't require --overwrite option for bzr push</pre></dd>
<dt style="clear: both; float: left; font-weight: bold; width: 8em">Modified files</dt>
<dd style="margin-left: 8.5em">
<ul>
<li><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#diff-0">README.md</a></li>
<li><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#diff-1">sync.sh</a></li>
</ul>
</dd>
</dl>
<div class="diff-section" style="clear: both">
<table style="border-collapse: collapse; border: 1px solid #aaa">
<thead>
<tr class="diff-header" style="border: 1px solid #aaa">
<td colspan="3">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre"> Modified: README.md (+2 -2)</span>
<span class="diff-header-mark" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">===================================================================</span>
</pre>
</td>
</tr>
</thead>
<tbody>
<tr>
<th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L0L11">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L0L12">12</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L0L13">13</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L0L14">14</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L0L15">15</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L0L16">16</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L0L17">17</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L0L18">18</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L0L27">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L0L28">28</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L0L29">29</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L0L30">30</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L0L31">31</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L0L32">32</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L0L33">33</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L0L34">34</a></span>
</pre>
</th>
<th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L0R11">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L0R12">12</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L0R13">13</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L0R14">14</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L0R15">15</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L0R16">16</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L0R17">17</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L0R18">18</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L0R27">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L0R28">28</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L0R29">29</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L0R30">30</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L0R31">31</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L0R32">32</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L0R33">33</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L0R34">34</a></span>
</pre>
</th>
<td class="diff-content" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -12,7 +12,7 @@</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> ただし、launchpadのリポジトリへのpushはしません。↑のテスト実行結果を確</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> 認して、問題なければ以下のコマンドを使ってpushしてください。</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- % bzr push --overwrite lp:~mroonga/maria/mroonga</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ % (cd ../mroonga && bzr push lp:~mroonga/maria/mroonga)</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> ## 使い方</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -28,7 +28,7 @@</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> % cd ~/work/maria/mariadb-sync</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> % ./sync.sh</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> （↑の結果を確認し、問題がなかったら↓を実行。）</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- % bzr push --overwrite lp:~mroonga/maria/mroonga</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ % (cd ../mroonga && bzr push lp:~mroonga/maria/mroonga)</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> 最初にsync.shを実行したときはMariaDBのリポジトリを `bzr branch` してく</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> るのでとても時間がかかります。（数時間単位）</span>
</pre>
</td>
</tr>
</tbody>
</table>
<table style="border-collapse: collapse; border: 1px solid #aaa">
<thead>
<tr class="diff-header" style="border: 1px solid #aaa">
<td colspan="3">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre"> Modified: sync.sh (+2 -1)</span>
<span class="diff-header-mark" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">===================================================================</span>
</pre>
</td>
</tr>
</thead>
<tbody>
<tr>
<th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L1L4">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L1L5">5</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L1L6">6</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L1L7">7</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L1L8">8</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L1L9">9</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L1L10">10</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L1L44">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L1L45">45</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L1L46">46</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L1L47">47</a></span>
<span class="diff-line-number-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L1L48">48</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L1L49">49</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L1L50">50</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L1L51">51</a></span>
</pre>
</th>
<th class="diff-line-number" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L1R4">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L1R5">5</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L1R6">6</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L1R7">7</a></span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L1R8">8</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L1R9">9</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L1R10">10</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L1R11">11</a></span>
<span class="diff-line-number-hunk-header" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L1R45">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L1R46">46</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L1R47">47</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L1R48">48</a></span>
<span class="diff-line-number-nothing" style="display: block; white-space: pre"> </span>
<span class="diff-line-number-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L1R49">49</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L1R50">50</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L1R51">51</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/5f83eac4f21e391a267c3ccd4a0c5c37bdc0b5d8#L1R52">52</a></span>
</pre>
</th>
<td class="diff-content" style="border: 1px solid #aaa">
<pre style="border: 0; font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace; line-height: 1.2; margin: 0; padding: 0.5em; white-space: normal; width: auto"><span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -5,6 +5,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">set -u</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> set -x</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> merge_from=trunk</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+push_repository=lp:~mroonga/maria/mroonga</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> base_dir="$(cd $(dirname "$0") && pwd)"</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> top_dir="${base_dir}/.."</span>
<span class="diff-hunk-header" style="background-color: #eaf2f5; color: #999999; display: block; white-space: pre">@@ -45,7 +46,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">setup_repositories()</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> fi</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if [ ! -d mroonga ]; then</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- bzr branch ${merge_from} mroonga</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ bzr branch ${push_repository} mroonga</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> fi</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> }</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> </span>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>