[Xfce4-commits] <xfce4-power-manager:xfce-4.10> Added some code (very little) for Power DBus Service that will be used by both the session and the power manager.

[Nick Schermer]

On Thu, Jul 14, 2011 at 4:50 PM, Jannis Pohlmann <jannis at xfce.org> wrote:
> Hey,
>
> On Mon, 11 Jul 2011 08:48:34 +0200
> Nick Schermer <nickschermer at gmail.com> wrote:
>
>> On Wed, Jul 6, 2011 at 9:51 PM, Jannis Pohlmann <jannis at xfce.org>
>> wrote:
>> > On Wed,  6 Jul 2011 21:48:02 +0200 (CEST)
>> > Ali Abdallah <noreply at xfce.org> wrote:
>> >
>> >> Updating branch refs/heads/xfce-4.10
>> >>          to 900acdbb5ad48254c28ec9a3672d116995005104 (commit)
>> >>        from 4c705bee7f3bb154ad7212a4604e26de1ef123cc (commit)
>> >
>> > Please don't do this. We only branch for xfce-4.10 when releasing
>> > Xfce 4.10, not long before that. Please branch for the old version
>> > instead of the new code (if there is a serious reason to do so at
>> > all). All code for future versions is supposed to be written in
>> > feature branches and in master, not in a xfce-<future version>
>> > branch.
>> >
>> > I'm tempted to just delete that branch for you right now but I
>> > won't as you might lose work after all. ;)
>>
>> Better to do this in a "aliov/xfce-powerd" branch and a branch in
>> xfce4-session for the changes over there. If on both sides the code is
>> finished and a bit tested, merge them both in master.
>
> Ali, any news on this? Now that xfce4-power-manager is part of the Xfce
> core I'd like to resolve this issue as soon as possible. The xfce-4.10
> branch needs to be revoked.

I already removed the branch on mocha, so he just needs to push his
changes to "aliov/xfce-powerd" or something like that.

Nick