Re: kde-runtime module master and KDE/4.9 branches

2012-10-12 Thread Aurélien Gâteau
Le vendredi 12 octobre 2012 02:24:21 Laszlo Papp a écrit : > > Problem with this approach is the code you backport is usually a lot less > > tested as you made all your developments on master. In the svn days I even > > remember people telling me they were blind-backporting to stable because > > it

Re: kde-runtime module master and KDE/4.9 branches

2012-10-11 Thread Laszlo Papp
> Problem with this approach is the code you backport is usually a lot less > tested as you made all your developments on master. In the svn days I even > remember people telling me they were blind-backporting to stable because it > was "too much work to test the backported code". One could say th

Re: kde-runtime module master and KDE/4.9 branches

2012-10-11 Thread Aurélien Gâteau
Le jeudi 11 octobre 2012 20:02:51 Laszlo Papp a écrit : > > I think the problem is we don't know the commit policy for kde-runtime. Is > > it: > > > > fix-master-and-backport: fix in master, cherry-pick to KDE/4.x > > > > -- or -- > > > > fix-stable-and-merge: fix in KDE/4.x, merge KDE/4.x in ma

Re: kde-runtime module master and KDE/4.9 branches

2012-10-11 Thread Aurélien Gâteau
Le jeudi 11 octobre 2012 20:02:51 Laszlo Papp a écrit : > > I think the problem is we don't know the commit policy for kde-runtime. Is > > it: > > > > fix-master-and-backport: fix in master, cherry-pick to KDE/4.x > > > > -- or -- > > > > fix-stable-and-merge: fix in KDE/4.x, merge KDE/4.x in ma

Re: kde-runtime module master and KDE/4.9 branches

2012-10-11 Thread Laszlo Papp
> I think the problem is we don't know the commit policy for kde-runtime. Is it: > > fix-master-and-backport: fix in master, cherry-pick to KDE/4.x > > -- or -- > > fix-stable-and-merge: fix in KDE/4.x, merge KDE/4.x in master I personally prefer the former as in contributors should make sure if i

Re: kde-runtime module master and KDE/4.9 branches

2012-10-11 Thread Laszlo Papp
> If you merge stable into master you cannot miss changes. Sure, but what I was referring to, is more than that. People should do that for their changes, but you cannot expect there will be no mistakes at all in the procedure. Someone making sure about this on top of the utilities that can just be

Re: kde-runtime module master and KDE/4.9 branches

2012-10-11 Thread Aurélien Gâteau
Le mercredi 10 octobre 2012 11:13:57 Laszlo Papp a écrit : > > Hm, as kde-runtime is not frozen in master, whoever does fixes in 4.9 > > should merge them to master. > > Unfortunately, there may always be changes missing. Unsure how much it > can be automated, but I have the impression we do not e

Re: kde-runtime module master and KDE/4.9 branches

2012-10-10 Thread Laszlo Papp
> Hm, as kde-runtime is not frozen in master, whoever does fixes in 4.9 should > merge them to master. Unfortunately, there may always be changes missing. Unsure how much it can be automated, but I have the impression we do not exactly know until a person is responsible for making sure. Laszlo

Re: kde-runtime module master and KDE/4.9 branches

2012-10-10 Thread Andras Mantia
On Tuesday, October 09, 2012 07:56:48 PM Laszlo Papp wrote: > On Tue, Oct 9, 2012 at 7:54 PM, Laszlo Papp wrote: > > I think David took the responsibility for the merge: > > http://lists.kde.org/?l=kde-release-team&m=134510779413123&w=4 > > Oh, that was mentioned for kdelibs, and not kde-runtime.

Re: kde-runtime module master and KDE/4.9 branches

2012-10-09 Thread Laszlo Papp
On Tue, Oct 9, 2012 at 7:54 PM, Laszlo Papp wrote: > I think David took the responsibility for the merge: > http://lists.kde.org/?l=kde-release-team&m=134510779413123&w=4 Oh, that was mentioned for kdelibs, and not kde-runtime. Can someone do that for kde-runtime as well? Laszlo

Re: kde-runtime module master and KDE/4.9 branches

2012-10-09 Thread Laszlo Papp
I think David took the responsibility for the merge: http://lists.kde.org/?l=kde-release-team&m=134510779413123&w=4 Laszlo On Tue, Oct 9, 2012 at 3:36 PM, Aleix Pol wrote: > Hi, > I'm sending this e-mail because I was experiencing some bug with the > ScrollBar and I thought about fixing it. Then

kde-runtime module master and KDE/4.9 branches

2012-10-09 Thread Aleix Pol
Hi, I'm sending this e-mail because I was experiencing some bug with the ScrollBar and I thought about fixing it. Then I decided to commit it in KDE/4.9 because it's a bugfix and I realised it's already in 4.9, it's just not in master. My natural reaction was to see if we could merge KDE/4.9 to ma