On Sun, Dec 1, 2013 at 10:09 AM, David Faure <fa...@kde.org> wrote:
> On Sunday 01 December 2013 03:25:08 Mark Gaiser wrote:
>> In recent months Dawit (in cc) has added quite some nice optimizations
>> to the SMB kioslave. He' done with those changes now so i'd like to
>> pull those into the frameworks branch
>
> Indeed, we never merged master into frameworks, for kde-runtime, so a whole
> bunch of bugfixes were not merged.
>
> I just did the merge, since it involved fixing some conflicts in various
> places.
>
> Since you asked, here are the git commands I used.
>
> 5096 1.12.2013 09:51 0:01 cd 5/kde-runtime
> 5097 1.12.2013 09:51 0:06 git up
> 5100 1.12.2013 09:52 0:00 git merge origin/master
>
> CONFLICT (modify/delete): plasma/tools/plasmapkg/main.cpp deleted in HEAD and
> modified in origin/master. Version origin/master of
> plasma/tools/plasmapkg/main.cpp left in tree.
> CONFLICT (modify/delete):
> plasma/scriptengines/javascript/data/plasma-scriptengine-applet-simple-javascript.desktop
> deleted in HEAD and modified in origin/master. Version origin/master of
> plasma/scriptengines/javascript/data/plasma-scriptengine-applet-simple-javascript.desktop
> left in tree.
> CONFLICT (modify/delete):
> plasma/scriptengines/javascript/data/plasma-packagestructure-javascript-addon.desktop
> deleted in HEAD and modified in origin/master. Version origin/master of
> plasma/scriptengines/javascript/data/plasma-packagestructure-javascript-addon.desktop
> left in tree.
> CONFLICT (modify/delete):
> plasma/declarativeimports/qtextracomponents/mouseeventlistener.h deleted in
> HEAD and modified in origin/master. Version origin/master of
> plasma/declarativeimports/qtextracomponents/mouseeventlistener.h left in tree.
> CONFLICT (modify/delete):
> plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp deleted in
> HEAD and modified in origin/master. Version origin/master of
> plasma/declarativeimports/qtextracomponents/mouseeventlistener.cpp left in
> tree.
> CONFLICT (modify/delete):
> plasma/declarativeimports/plasmacomponents/qml/ToolButton.qml deleted in HEAD
> and modified in origin/master. Version origin/master of
> plasma/declarativeimports/plasmacomponents/qml/ToolButton.qml left in tree.
> Removing kwalletd/kwalletopenloop.h
> Removing kwalletd/kwalletopenloop.cpp
> Auto-merging kwalletd/CMakeLists.txt
> Auto-merging ktimezoned/ktimezonedbase.h
> CONFLICT (content): Merge conflict in ktimezoned/ktimezonedbase.h
> Auto-merging kioslave/trash/discspaceutil.cpp
> CONFLICT (content): Merge conflict in kioslave/trash/discspaceutil.cpp
> Removing kioslave/thumbnail/icoutils.cpp
> Auto-merging kioslave/thumbnail/CMakeLists.txt
> CONFLICT (content): Merge conflict in kioslave/thumbnail/CMakeLists.txt
> Auto-merging kioexec/main.cpp
> CONFLICT (content): Merge conflict in kioexec/main.cpp
> Auto-merging kglobalaccel/kglobalacceld.cpp
> Recorded preimage for 'kioexec/main.cpp'
> Recorded preimage for 'kioslave/thumbnail/CMakeLists.txt'
> Recorded preimage for 'kioslave/trash/discspaceutil.cpp'
> Recorded preimage for 'ktimezoned/ktimezonedbase.h'
> Automatic merge failed; fix conflicts and then commit the result.
>
> 5023 1.12.2013 09:55 1:50 git log -p origin/master
> kioslave/thumbnail/CMakeLists.txt
> 5104 1.12.2013 09:55 1:13 vi kioslave/thumbnail/CMakeLists.txt
> 5105 1.12.2013 09:56 0:00 git add kioslave/thumbnail/CMakeLists.txt
> 5106 1.12.2013 09:56 0:14 vi kioslave/trash/discspaceutil.cpp
> 5107 1.12.2013 09:56 0:00 git add kioslave/trash/discspaceutil.cpp
> 5109 1.12.2013 09:57 0:16 git log -p origin/master
> ktimezoned/ktimezonedbase.h
> 5110 1.12.2013 09:57 0:13 vi ktimezoned/ktimezonedbase.h
> 5111 1.12.2013 09:57 0:00 git add ktimezoned/ktimezonedbase.h
> 5025 1.12.2013 09:58 0:06 git log -p origin/master kioexec/CMakeLists.txt
> 5113 1.12.2013 09:58 0:00 git rm -r plasma
> 5114 1.12.2013 09:58 0:01 git diff
> 5115 1.12.2013 09:58 0:17 git diff --cached
> 5026 1.12.2013 09:58 1:13 git log -p origin/master kioexec/main.cpp
> 5116 1.12.2013 09:58 1:18 vi kioexec/main.cpp
> 5118 1.12.2013 09:59 0:00 git add kioexec/main.cpp
> 5119 1.12.2013 09:59 0:04 git diff --cached kioexec/main.cpp
> 5027 1.12.2013 10:00 0:02 make -j8
> 5033 1.12.2013 10:01 1:17 git commit
> 5034 1.12.2013 10:03 0:07 git wup [*]
> 5035 1.12.2013 10:03 0:08 git push
>
> wup = log --stat @{u}.. # "what will push actually push"
>
> --
> David Faure, fa...@kde.org, http://www.davidfaure.fr
> Working on KDE, in particular KDE Frameworks 5
>
Hi David,
Thank you very much for that!
I was expecting something like merging only the smb folder or
cherry-picking some changes, but no full merge. Thank you for taking
care of that :)
I like "git wup"!
Cheers,
Mark
_______________________________________________
Kde-frameworks-devel mailing list
Kde-frameworks-devel@kde.org
https://mail.kde.org/mailman/listinfo/kde-frameworks-devel
