<br><br><div class="gmail_quote">On Wed, Sep 26, 2012 at 11:17 AM, Frank Reininghaus <span dir="ltr"><<a href="mailto:frank78ac@googlemail.com" target="_blank">frank78ac@googlemail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Hi Dawit,<br>
<br>
2012/9/26 Dawit A:<br>
<div class="im">> I still do not see how this can work cleanly. People commit changes in<br>
> master and then backport them to the 4.9 branch. Which BTW was by far the<br>
> most common workflow before the switch over to git. As an example if you<br>
> attempt to 'merge' kde-baseapps 4.9 branch into master right now, you will<br>
> get a duplicate log entry for the following commit which has been<br>
> cherry-picked into the 4.9 branch from master:<br>
><br>
> commit 8c4fa6e03b6b6acedf3a03eef5347f38680818fe<br>
> Author: Emmanuel Pescosta <<a href="mailto:emmanuelpescosta099@gmail.com">emmanuelpescosta099@gmail.com</a>><br>
> Date: Wed Sep 12 19:33:28 2012 +0200<br>
><br>
> Fixes Bug 305783 - dragging a file over a directory #c4<br>
> does not expand the dir => Bug discovered: When you drag a<br>
> item onto a folder-view-item and then move it away<br>
> instantly before the autoactivation event is triggered<br>
> (After 750ms), the folder will be opened anyway.<br>
><br>
> BUG: 305783<br>
> REVIEW: 106381<br>
> FIXED-IN: 4.9.2<br>
> (cherry picked from commit 9ab8bcd6aa3ce5d96ee380d5f22d77c2f0a38881)<br>
<br>
</div>I think it has just been overlooked first that this commit is safe<br>
enough to go into the 4.9 branch. I was the one who encouraged<br>
Emmanuel to commit that fix to 4.9 as well. If you first fix something<br>
in master and later decide that it can also be pushed to 4.9, I see no<br>
other option but to cherry-pick.<br>
<div class="im"><br>
> How can that be resolved or do we live with the duplicate log entries ?<br>
<br>
</div>I don't know how to avoid a duplicate entry in that case. But given<br>
the big mess of duplicate entries that we had in the past every time<br>
someone decided to merge, I think that a single duplicate entry is<br>
something that we can probably live with.<br></blockquote><div><br></div><div>Well, I found an answer to my own question at [1]. Basically, it says doing a rebase of the branch with the master and merging afterwards will prevent the duplicate log message:</div>
<div><br></div><div>$ git co -b 4.9 origin/KDE/4.9</div><div>$ git co -b master origin/master</div><div>$ git rebase master 4.9</div><div>$ git co master</div><div>$ git merge 4.9</div><div><br></div><div>Perhaps people with more intimate knowledge of git than I want to comment on the validity of above steps ? However, it seems to work just fine when I tested it against kde-baseapps:</div>
<div><br></div><div><div>$ git rebase master 4.9</div><div>First, rewinding head to replay your work on top of it...</div><div>Applying: SVN_SILENT made messages (.desktop file)</div><div>Applying: When user requests to open bookmark urls in a new window or tab, filter the</div>
<div>Applying: Fix crash when receiving Nepomuk info for a recently deleted file.</div><div>Applying: Fixed CTRL+Tab not working when using Dolphin's filemanagement part in Konqueror.</div><div>Applying: Do not crash when the apply/ok button is pressed after the defaults button when site specific policies present</div>
<div>Applying: Fix a Bug in KFileItemModelRolesUpdate::setEnabledPlugins.</div><div><br></div><div>$ git br</div><div>* 4.9</div><div> master</div><div> work</div><div><br></div><div>$ git co master</div><div>Switched to branch 'master'</div>
</div><div><br></div><div><div>$ git merge 4.9</div><div>Updating d06163e..3ee40a3</div><div>Fast-forward</div><div> dolphin/src/kitemviews/kfileitemmodelrolesupdater.cpp | 9 ++++++++-</div><div> dolphin/src/kitemviews/kitemlistview.cpp | 2 ++</div>
<div> konqueror/settings/kio/kcookiespolicies.cpp | 1 +</div><div> konqueror/settings/kio/proxy.desktop | 1 +</div><div> konqueror/src/konqmainwindow.cpp | 9 +++++----</div>
<div> 5 files changed, 17 insertions(+), 5 deletions(-)</div><div><br></div><div>$ git log origin/master..</div><div>commit 3ee40a3c7063e8053cc87b2e9bd8f3a321e67949</div><div>Author: Emmanuel Pescosta <<a href="mailto:emmanuelpescosta099@gmail.com">emmanuelpescosta099@gmail.com</a>></div>
<div>Date: Wed Sep 26 17:36:51 2012 +0200</div><div><br></div><div> Fix a Bug in KFileItemModelRolesUpdate::setEnabledPlugins.</div><div> Changes were never overtaken because of a wrong comparison.</div><div> </div>
<div> FIXED-IN: 4.9.2</div><div><br></div><div>commit 2848b923ddeb65c4dcb5b469c4ac6f0e9a204eb9</div><div>Author: Dawit Alemayehu <<a href="mailto:adawit@kde.org">adawit@kde.org</a>></div><div>Date: Wed Sep 26 10:28:11 2012 -0400</div>
<div><br></div><div> Do not crash when the apply/ok button is pressed after the defaults button when site specific policies present</div><div><br></div><div>commit e95e336767ba9c4d761fdb9f356dd6d78ad01c16</div><div>Author: Dawit Alemayehu <<a href="mailto:adawit@kde.org">adawit@kde.org</a>></div>
<div>Date: Tue Sep 25 03:40:50 2012 -0400</div><div><br></div><div> Fixed CTRL+Tab not working when using Dolphin's filemanagement part in Konqueror.</div><div> </div><div> BUG: 302329</div><div> FIXED-IN: 4.9.2</div>
<div> REVIEW: 106569</div><div><br></div><div>commit 38e3b55b480cb586ccc65c7661775185ddca0c22</div><div>Author: Frank Reininghaus <<a href="mailto:frank78ac@googlemail.com">frank78ac@googlemail.com</a>></div><div>
Date: Mon Sep 24 22:59:59 2012 +0200</div><div><br></div><div> Fix crash when receiving Nepomuk info for a recently deleted file.</div><div> </div><div> BUG: 306036</div><div> FIXED-IN: 4.9.2</div><div><br>
</div>
<div>commit 4fb0e0a9235b88df409a3718e75f606e56039b6f</div><div>Author: Dawit Alemayehu <<a href="mailto:adawit@kde.org">adawit@kde.org</a>></div><div>Date: Sun Sep 23 02:42:55 2012 -0400</div><div><br></div><div>
When user requests to open bookmark urls in a new window or tab, filter the</div>
<div> URLs before opening them.</div><div> </div><div> BUG: 145873</div><div> FIXED-IN: 4.9.2</div><div><br></div><div>commit 689108b0f37d9ac6f54261f5b94f623e3e63d448</div><div>Author: Script Kiddy <<a href="mailto:scripty@kde.org">scripty@kde.org</a>></div>
<div>Date: Sat Sep 22 17:32:41 2012 +0200</div><div><br></div></div><div><br></div><div>[1] <a href="http://davitenio.wordpress.com/2008/09/27/git-merge-after-git-cherry-pick-avoiding-duplicate-commits/">http://davitenio.wordpress.com/2008/09/27/git-merge-after-git-cherry-pick-avoiding-duplicate-commits/</a></div>
</div>