Re: merging development branch into master

2012-11-05 Thread 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

2012-11-04 Thread 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

Re: merging development branch into master

2012-11-04 Thread 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.kd

Re: merging development branch into master

2012-11-04 Thread 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

Re: merging development branch into master

2012-11-03 Thread 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

2012-11-03 Thread 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 f

Re: merging development branch into master

2012-11-03 Thread 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)

merging development branch into master

2012-11-03 Thread 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 l