<!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">2013-06-12 16:09:06 +0900 (Wed, 12 Jun 2013)</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/9b1f89a97bcdbd175f49ed897aa4bfc9dc35e6ee">9b1f89a97bcdbd175f49ed897aa4bfc9dc35e6ee</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">Merge from trunk not 10.0-base</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/9b1f89a97bcdbd175f49ed897aa4bfc9dc35e6ee#diff-0">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: sync.sh (+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/9b1f89a97bcdbd175f49ed897aa4bfc9dc35e6ee#L0L3">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/9b1f89a97bcdbd175f49ed897aa4bfc9dc35e6ee#L0L4">4</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/9b1f89a97bcdbd175f49ed897aa4bfc9dc35e6ee#L0L5">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/9b1f89a97bcdbd175f49ed897aa4bfc9dc35e6ee#L0L6">6</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/9b1f89a97bcdbd175f49ed897aa4bfc9dc35e6ee#L0L7">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/9b1f89a97bcdbd175f49ed897aa4bfc9dc35e6ee#L0L8">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/9b1f89a97bcdbd175f49ed897aa4bfc9dc35e6ee#L0L9">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/9b1f89a97bcdbd175f49ed897aa4bfc9dc35e6ee#L0L10">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/9b1f89a97bcdbd175f49ed897aa4bfc9dc35e6ee#L0L26">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/9b1f89a97bcdbd175f49ed897aa4bfc9dc35e6ee#L0L27">27</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/9b1f89a97bcdbd175f49ed897aa4bfc9dc35e6ee#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/9b1f89a97bcdbd175f49ed897aa4bfc9dc35e6ee#L0L29">29</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/9b1f89a97bcdbd175f49ed897aa4bfc9dc35e6ee#L0L30">30</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/9b1f89a97bcdbd175f49ed897aa4bfc9dc35e6ee#L0L31">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/9b1f89a97bcdbd175f49ed897aa4bfc9dc35e6ee#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/9b1f89a97bcdbd175f49ed897aa4bfc9dc35e6ee#L0L33">33</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/9b1f89a97bcdbd175f49ed897aa4bfc9dc35e6ee#L0R3">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/9b1f89a97bcdbd175f49ed897aa4bfc9dc35e6ee#L0R4">4</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/9b1f89a97bcdbd175f49ed897aa4bfc9dc35e6ee#L0R5">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/9b1f89a97bcdbd175f49ed897aa4bfc9dc35e6ee#L0R6">6</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/9b1f89a97bcdbd175f49ed897aa4bfc9dc35e6ee#L0R7">7</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/9b1f89a97bcdbd175f49ed897aa4bfc9dc35e6ee#L0R8">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/9b1f89a97bcdbd175f49ed897aa4bfc9dc35e6ee#L0R9">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/9b1f89a97bcdbd175f49ed897aa4bfc9dc35e6ee#L0R10">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/9b1f89a97bcdbd175f49ed897aa4bfc9dc35e6ee#L0R26">...</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/9b1f89a97bcdbd175f49ed897aa4bfc9dc35e6ee#L0R27">27</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/9b1f89a97bcdbd175f49ed897aa4bfc9dc35e6ee#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/9b1f89a97bcdbd175f49ed897aa4bfc9dc35e6ee#L0R29">29</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/9b1f89a97bcdbd175f49ed897aa4bfc9dc35e6ee#L0R30">30</a></span>
<span class="diff-line-number-not-changed" style="display: block; white-space: pre"><a href="https://github.com/mroonga/mariadb-sync/commit/9b1f89a97bcdbd175f49ed897aa4bfc9dc35e6ee#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/9b1f89a97bcdbd175f49ed897aa4bfc9dc35e6ee#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/9b1f89a97bcdbd175f49ed897aa4bfc9dc35e6ee#L0R33">33</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">@@ -4,7 +4,7 @@ <span class="diff-context" style="background-color: #ffffaa; color: #000000">set -e</span></span>
<span class="diff-not-changed" style="display: block; white-space: pre"> set -u</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-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">-merge_from=10.0-base</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+merge_from=trunk</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">@@ -27,7 +27,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"> </span>
<span class="diff-not-changed" style="display: block; white-space: pre"> if [ ! -d ${merge_from} ]; then</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> bzr init-repo .</span>
<span class="diff-deleted" style="background-color: #ffaaaa; color: #000000; display: block; white-space: pre">- bzr branch lp:~maria-captains/maria/${merge_from}</span>
<span class="diff-added" style="background-color: #aaffaa; color: #000000; display: block; white-space: pre">+ bzr branch lp:maria ${merge_from}</span>
<span class="diff-not-changed" style="display: block; white-space: pre"> rm -rf 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>
</pre>
</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>