<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/100886/">http://git.reviewboard.kde.org/r/100886/</a>
</td>
</tr>
</table>
<br />
<p>Ship it!</p>
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">I think you've mixed up a few other bits of code/review in here.
The approach I go for is to do the following:
git checkout master
git checkout -b mynewfeature
do some work
commit it
git checkout master
git checkout -b myothernewfeature
.
.
.
If your second feature really does depend on the first branch, when you make a a diff run post-review --parent=mynewfeature, so the diff only covers the actual changes.
(hope that all makes sense)</pre>
<br />
<div>
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; border-collapse: collapse; margin: 2px padding: 2px;">
<thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; font-size: 9pt; padding: 4px 8px; text-align: left;">
<a href="http://git.reviewboard.kde.org/r/100886/diff/1/?file=11555#file11555line214" style="color: black; font-weight: bold; text-decoration: underline;">lib/chat-widget.cpp</a>
<span style="font-weight: normal;">
(Diff revision 1)
</span>
</th>
</tr>
</thead>
<tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
<tr>
<td colspan="4"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">ChatWidget::ChatWidget(const Tp::TextChannelPtr & channel, QWidget *parent)</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2"></font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td>
<th bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">214</font></th>
<td bgcolor="#c5ffc4" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="k">if</span> <span class="p">(</span><span class="n">d</span><span class="o">-></span><span class="n">channel</span><span class="o">-></span><span class="n">hasChatStateInterface</span><span class="p">())</span> <span class="p">{</span></pre></td>
</tr>
</tbody>
</table>
<pre style="margin-left: 2em; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">I assume this part is the only part that's of this change.
Makes sense to me.</pre>
</div>
<br />
<p>- David</p>
<br />
<p>On March 18th, 2011, 11:33 a.m., Florian Reinhard wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" style="background-image: url('http://git.reviewboard.kde.orgrb/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 Florian Reinhard.</div>
<p style="color: grey;"><i>Updated March 18, 2011, 11:33 a.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;">Let's save some cpu cylcles and don't detect typing in chat-widget when we can't use it.</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;">no more warnings like this on cli:
tp-qt4 0.5.11.1 WARN: TextChannel::requestChatState() used with no chat state interface</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>config/kcm_telepathy_chat_config.desktop <span style="color: grey">(7641c3a2af38ffd0c426185461bc82aa3f95fcb2)</span></li>
<li>lib/adium-theme-view.cpp <span style="color: grey">(0133f3d0309147083a91773be37d72d016ace08d)</span></li>
<li>lib/chat-widget.cpp <span style="color: grey">(6ea639b0b3696030bd76bba219522abf70aef400)</span></li>
<li>lib/chat-window-style.cpp <span style="color: grey">(e5003ec7acf1f02e6eed178773aafc02dad82228)</span></li>
</ul>
<p><a href="http://git.reviewboard.kde.org/r/100886/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>