<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="8" style="border: 1px #c9c399 solid;">
<tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="http://git.reviewboard.kde.org/r/112872/">http://git.reviewboard.kde.org/r/112872/</a>
</td>
</tr>
</table>
<br />
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" style="background-image: url('http://git.reviewboard.kde.org/static/rb/images/review_request_box_top_bg.ab6f3b1072c9.png'); background-position: left top; background-repeat: repeat-x; border: 1px black solid;">
<tr>
<td>
<div>Review request for Marble.</div>
<div>By Utku Aydın.</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">"cloudsync-bookmarks" branch on GitHub: https://github.com/utkuaydin/marble/commits/cloudsync-bookmarks
Adds bookmark synchronization with ownCloud.
- Does a three way merge. http://en.wikipedia.org/wiki/Merge_(revision_control)#Three-way_merge
- Synchronization starts automatically when Marble is started, when local bookmarks are modified and every hour.
- Conflict resolution is included.
What's missing? (Must be included before merging to master):
- Conflict dialog which happens when there is no common ancestor.
- Initial synchronization with a newly installed of instance ownCloud and Marble app.
- Unit test for diff and merge.
I have to leave home for school on Sept. 22nd so unfortunately I might not be around for implementing those soon. Apologies.</pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">I manually tested synchronizing with ownCloud application. I intentionally created conflicts by...
- Renaming the same placemark on both cloud and local
- Deleting one from cloud and renaming the same bookmark locally</pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>src/ControlView.h <span style="color: grey">(0f3274e)</span></li>
<li>src/ControlView.cpp <span style="color: grey">(237ae12)</span></li>
<li>src/QtMainWindow.h <span style="color: grey">(80ae250)</span></li>
<li>src/QtMainWindow.cpp <span style="color: grey">(4f70250)</span></li>
<li>src/lib/CMakeLists.txt <span style="color: grey">(4f2eee1)</span></li>
<li>src/lib/MarbleCloudSyncSettingsWidget.ui <span style="color: grey">(8c8bc9a)</span></li>
<li>src/lib/QtMarbleConfigDialog.h <span style="color: grey">(97e972e)</span></li>
<li>src/lib/QtMarbleConfigDialog.cpp <span style="color: grey">(1cb7e3b)</span></li>
<li>src/lib/cloudsync/BookmarkSyncManager.h <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/lib/cloudsync/BookmarkSyncManager.cpp <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/lib/cloudsync/CloudSyncManager.h <span style="color: grey">(e6e850b)</span></li>
<li>src/lib/cloudsync/CloudSyncManager.cpp <span style="color: grey">(6c90b0d)</span></li>
<li>src/lib/cloudsync/ConflictDialog.h <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/lib/cloudsync/ConflictDialog.cpp <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/lib/cloudsync/MergeItem.h <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/lib/cloudsync/MergeItem.cpp <span style="color: grey">(PRE-CREATION)</span></li>
<li>src/lib/cloudsync/OwncloudSyncBackend.h <span style="color: grey">(e8560cd)</span></li>
<li>src/lib/cloudsync/OwncloudSyncBackend.cpp <span style="color: grey">(c7b291b)</span></li>
<li>src/lib/cloudsync/RouteSyncManager.cpp <span style="color: grey">(5399210)</span></li>
<li>src/marble_part.h <span style="color: grey">(a53602e)</span></li>
<li>src/marble_part.cpp <span style="color: grey">(b032a8b)</span></li>
<li>src/plugins/declarative/CloudSync.h <span style="color: grey">(3de04e4)</span></li>
<li>src/plugins/declarative/CloudSync.cpp <span style="color: grey">(ccd0e25)</span></li>
<li>src/plugins/declarative/MarbleDeclarativePlugin.cpp <span style="color: grey">(959063b)</span></li>
</ul>
<p><a href="http://git.reviewboard.kde.org/r/112872/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>