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