Re: merging development branch into master

[Sebastian Kügler]

On Sunday, November 04, 2012 09:34:03 Andriy Rysin wrote:
> * or we should rebase feature branch on master and then generate the 
> review diff?

That should work.
-- 
sebas

http://www.kde.org | http://vizZzion.org | GPG Key ID: 9119 0EF9

Re: merging development branch into master

[Weng Xuetian]

On Sun, Nov 4, 2012 at 5:27 PM, Andriy Rysin  wrote:

> On 11/04/2012 01:18 AM, Shaun Reich wrote:
>
>> well, you've got until november 8th (4 days according to my clock) until
>> hard feature freeze which blocks even those on the planned feature list.
>>
>> so, as my procrastinating self would say you've got "plenty of time" ;)
>>
> done: 
> https://git.reviewboard.kde.**org/r/107202/
> I could not find kde-workspace or systemsettings groups so I've added it
> to kde-runtime
>
> I would appreciate any feedback,
> Thanks,
> Andriy
>
> P.S. I rebased the feature branch locally so we'll be able to FF (or just
> apply the patch)
>

Hi all,

sorry for interrupt the thread, but I have some code that ported from
libgnomekbd (port to Qt), used in my own project, idea is similar, but
provides more feature though.

https://github.com/fcitx/kcm-fcitx/blob/master/layout/keyboardlayoutwidget.cpp

It's layout is based on parsing xkb model file, not hard code, and key
press can be displayed on the preview.
It's quite standalone, I'm not sure if you guys want to take a look at it.

Re: merging development branch into master

[Andriy Rysin]

On 11/04/2012 01:18 AM, Shaun Reich wrote:
well, you've got until november 8th (4 days according to my clock) 
until hard feature freeze which blocks even those on the planned 
feature list.


so, as my procrastinating self would say you've got "plenty of time" ;)

done: https://git.reviewboard.kde.org/r/107202/
I could not find kde-workspace or systemsettings groups so I've added it 
to kde-runtime


I would appreciate any feedback,
Thanks,
Andriy

P.S. I rebased the feature branch locally so we'll be able to FF (or 
just apply the patch)

Re: merging development branch into master

[Andriy Rysin]

On 11/04/2012 01:18 AM, Shaun Reich wrote:
well, you've got until november 8th (4 days according to my clock) 
until hard feature freeze which blocks even those on the planned 
feature list.


so, as my procrastinating self would say you've got "plenty of time" ;)

ok, I tried to do
post-review -n --parent=master
but that generated a lot of changes - most of those are the ones done in 
master since our feature branch was created, I guess we should have 
created 'tracking' branch?


So the question I have:
* is there a way to create a review generating only changes done in 
feature branch?
* or we should rebase feature branch on master and then generate the 
review diff?


Thanks,
Andriy

Re: merging development branch into master

[Shaun Reich]

well, you've got until november 8th (4 days according to my clock) until
hard feature freeze which blocks even those on the planned feature list.

so, as my procrastinating self would say you've got "plenty of time" ;)


-- 
Shaun Reich,
KDE Software Developer (kde.org)

Re: merging development branch into master

[Andriy Rysin]

Yes, it's in feature list for 4.10

I can try to submit it to review if I have time tomorrow, but wouldn't it
be a bit too late?

Thanks,
Andriy
On Nov 4, 2012 12:17 AM, "Shaun Reich"  wrote:

> >* I guess once the branch is merged it should be closed for business:
> fixes go >into master and new features go into new branch, right?
>
> yup, well. assuming that we are at/past the feature freeze at that point.
>
> thing is...was this added to the feature page? (if not it cannot be merged
> this cycle)
>
>
> http://techbase.kde.org/Schedules/KDE4/4.10_Release_Schedule#Thursday.2C_October_25.2C_2012:_KDE_SC_4.10_Soft_Feature_Freeze
>
>
> additionally, shouldn't we do this on reviewboard so everyone can check it
> out? i realize it's a bit a pain with big old branches, but would be the
> best.
>
> --
> Shaun Reich,
> KDE Software Developer (kde.org)
>

Re: merging development branch into master

[Shaun Reich]

>* I guess once the branch is merged it should be closed for business:
fixes go >into master and new features go into new branch, right?

yup, well. assuming that we are at/past the feature freeze at that point.

thing is...was this added to the feature page? (if not it cannot be merged
this cycle)

http://techbase.kde.org/Schedules/KDE4/4.10_Release_Schedule#Thursday.2C_October_25.2C_2012:_KDE_SC_4.10_Soft_Feature_Freeze


additionally, shouldn't we do this on reviewboard so everyone can check it
out? i realize it's a bit a pain with big old branches, but would be the
best.

-- 
Shaun Reich,
KDE Software Developer (kde.org)

merging development branch into master

[Andriy Rysin]

Hi all

My student for SoK (Shivam Makkar) was working on a feature this summer 
(to show preview of a keyboard layout) and I think it's ready to be 
included in 4.10 (although some improvements and cleanup would not hurt 
a bit later). It seems that we're getting close to feature freeze so I'd 
like to merge the branch "amourphiouskb" into master.


I read a bit about merging development branches but what I found was on 
kdelibs rather than on kde-workspace and I am a bit short on free time 
to put all the pieces together (I've got a newborn in the house :)) and 
I don't want to mess the merge up so I would appreciate some help to get 
the code merged. So here are the questions:
* looks like rebase is preferred if branch is local, but this branch is 
in repository so I guess we need to merge?
* this branch hasn't been synced with master since July, is this a 
necessary step before merging it into master? if yes: I tried to rebase 
this branch but got merge errors, what's the best way to deal with it?
* I guess once the branch is merged it should be closed for business: 
fixes go into master and new features go into new branch, right?


Thanks in advance,
Andriy