<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="https://git.reviewboard.kde.org/r/114674/">https://git.reviewboard.kde.org/r/114674/</a>
</td>
</tr>
</table>
<br />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
<p style="margin-top: 0;">On December 27th, 2013, 4:33 p.m. UTC, <b>Albert Astals Cid</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;">Makes sense :-)
Any reason you only want to commit to master and not KDE/4.11 and then merge to 4.12 and master?</pre>
</blockquote>
<p>On December 28th, 2013, 3:07 a.m. UTC, <b>Ian Wadham</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;">None, apart from the fact I do not know or have forgotten how to do what you suggest. I think I can figure out how to commit to master and cherry-pick back into those other branches.
BTW, is there going to be a KDE 4.13? I see no schedule for it.</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;">Well it's basically
git checkout KDE/4.11
make the changes
git commit -a
git push origin KDE/4.11
git checkout KDE/4.12
git merge origin/KDE/4.11
git commit -a
git push origin KDE/4.12
git checkout master
git merge origin/KDE/4.12
git commit -a
git push origin master
If you feel usafe i can do it for you.
Yes, there will be a 4.13, and yes, there's no schedule for it yet.</pre>
<br />
<p>- Albert</p>
<br />
<p>On December 26th, 2013, 9:49 p.m. UTC, Ian Wadham wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" style="background-image: url('https://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 KDE Games.</div>
<div>By Ian Wadham.</div>
<p style="color: grey;"><i>Updated Dec. 26, 2013, 9:49 p.m.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Bugs: </b>
<a href="http://bugs.kde.org/show_bug.cgi?id=310411">310411</a>
</div>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
palapeli
</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;">The problem occurs because no puzzle has been selected and loaded when Palapeli starts, therefore there is no puzzle to "restart".
The solution is to enable 'Game>Restart puzzle' only when a puzzle has been selected and loaded and is being solved (the action makes no sense in Palapeli's Collection mode), also to return immediately from Palapeli::Scene:restartPuzzle() if, for any other reason, no puzzle has been successfully loaded. </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;">Tried 'Game>Restart puzzle' from Collection mode (no action) and from Puzzle mode (puzzle pieces are dismantled and re-shuffled, as expected).</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/engine/scene.cpp <span style="color: grey">(8be0925)</span></li>
<li>src/window/mainwindow.cpp <span style="color: grey">(e3305fb)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/114674/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>