[kdelibs/frameworks-kcolors] /: Move khbox and kvbox from kdeui/widgets to staging/kwidgets/src/widgets

Ben Cooksley bcooksley at kde.org
Sun Mar 11 08:27:05 UTC 2012


On Sun, Mar 11, 2012 at 8:33 PM, David Faure <faure at kde.org> wrote:
> On Wednesday 07 March 2012 15:17:13 Giorgos Tsiapaliwkas wrote:
>> Git commit d470e76948624257610bd7c583c442a542411093 by Giorgos Tsiapaliwkas.
>> Committed on 07/03/2012 at 15:16.
>> Pushed by tsiapaliwkas into branch 'frameworks-kcolors'.
>>
>> Move khbox and kvbox from kdeui/widgets to staging/kwidgets/src/widgets
>
> Can I cherry-pick this into frameworks, and we continue the work on "kwidgets"
> in frameworks?
>
> Otherwise you'll be stuck with restructuring all of kdeui yourself in
> frameworks-kcolors, with stuff that doesn't compile for a long time.
>
> (while on the other hand in frameworks we could ensure that everything
> compiles after moving each widget)
>
> Alternatively you could swap the order of commits in your branch so I can
> merge this commit as the first one of the branch, to prevent conflicts; but I'm
> not sure you (or anyone) is allowed to force-push into frameworks-kcolors. ->
> CC'ed sysadmin about that question.

Force push is in general a restricted activity which requires special
permissions to be granted on a case by case basis.

In general, we discourage force pushing on public, published branches
due to the problems it has been known to give those with pre-existing
checkouts of the affected branches. Given this is a semi-private work
branch, it should be fine in this case if needed.

Given the nature of this work, I can't help but think it might be
better to do it in the main frameworks branch however at this point
(many hands make light work, etc)

>
> --
> David Faure, faure at kde.org, http://www.davidfaure.fr
> Sponsored by Nokia to work on KDE, incl. KDE Frameworks 5
>

Regards,
Ben


More information about the Kde-frameworks-devel mailing list