<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/101438/">http://git.reviewboard.kde.org/r/101438/</a>
</td>
</tr>
</table>
<br />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<p style="margin-top: 0;">On May 25th, 2011, 7:47 p.m., <b>George Goldberg</b> wrote:</p>
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">If you merge this, please do it without making a mess of the history. You should create a clone of the existing telepathy-presence-applet repository, make a new branch, cherry pick your commits onto that branch, and then merge this to the master branch of the telepathy-presence-applet repository. Otherwise you'll make a mess of the history.
For future reference, when modifying existing code, please do it by branching from the original code instead of starting a new history from scratch (even if you are basically starting again if you intend to merge it ontop of the old code eventually). That way, reviewboard will also work.</pre>
</blockquote>
</blockquote>
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Could you please do this? I don't want to mess things up</pre>
<br />
<p>- Francesco</p>
<br />
<p>On May 25th, 2011, 4:19 p.m., Francesco Nwokeka wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" style="background-image: url('http://git.reviewboard.kde.org/media/rb/images/review_request_box_top_bg.png'); background-position: left top; background-repeat: repeat-x; border: 1px black solid;">
<tr>
<td>
<div>Review request for Telepathy.</div>
<div>By Francesco Nwokeka.</div>
<p style="color: grey;"><i>Updated May 25, 2011, 4:19 p.m.</i></p>
<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;">I would like to merge on top of the current master, my scratch project. This way people can test the new plasmoid applet and report bugs on it.
The repo is located @ http://quickgit.kde.org/?p=scratch%2Fnwokeka%2FKDE-Telepathy-presence-plasmoid.git&a=summary
clone : git://anongit.kde.org/scratch/nwokeka/KDE-Telepathy-presence-plasmoid.git</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;">
</ul>
<p><a href="http://git.reviewboard.kde.org/r/101438/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>