Re: 4.7 mergable into frameworks. No need to cherry-pick

2011-08-28 Thread Chusslove Illich
> [: Stephen Kelly :] > Also, if you make a change which is likely not to apply cleanly to > frameworks, it's probably best for you to merge it sooner rather than wait > for someone else to do it wrongly. Good point, I might have missed that. So, I'll always check if 4.7 change applies cleanly, an

Re: 4.7 mergable into frameworks. No need to cherry-pick

2011-08-28 Thread Stephen Kelly
Chusslove Illich wrote: >> [: Stephen Kelly :] >> We don't have to make one commit on 4.7 == one merge into frameworks. >> >> We can just delay the merge and do it once a day or week. No one is using >> frameworks, so we just need to make sure the commits get in eventually or >> before it becomes

Re: 4.7 mergable into frameworks. No need to cherry-pick

2011-08-28 Thread Chusslove Illich
> [: Stephen Kelly :] > We don't have to make one commit on 4.7 == one merge into frameworks. > > We can just delay the merge and do it once a day or week. No one is using > frameworks, so we just need to make sure the commits get in eventually or > before it becomes hard to merge. Who exactly is

Re: 4.7 mergable into frameworks. No need to cherry-pick

2011-08-26 Thread Michael Jansen
On Friday, August 26, 2011 03:14:26 PM Stephen Kelly wrote: > Aaron J. Seigo wrote: > > On Friday, August 26, 2011 13:50:51 Michael Jansen wrote: > >> That reminds me of my futile attempts to convince you guys of the need > >> for a daily "is everything merged check" that sends its results (if stuf

Re: 4.7 mergable into frameworks. No need to cherry-pick

2011-08-26 Thread Stephen Kelly
Aaron J. Seigo wrote: > On Friday, August 26, 2011 13:50:51 Michael Jansen wrote: >> That reminds me of my futile attempts to convince you guys of the need >> for a daily "is everything merged check" that sends its results (if stuff >> to merge is open) to kde-core-develop list. > > write it and

Re: 4.7 mergable into frameworks. No need to cherry-pick

2011-08-26 Thread Aaron J. Seigo
On Friday, August 26, 2011 13:50:51 Michael Jansen wrote: > That reminds me of my futile attempts to convince you guys of the need for a > daily "is everything merged check" that sends its results (if stuff to > merge is open) to kde-core-develop list. write it and show everyone how useful it is :

Re: 4.7 mergable into frameworks. No need to cherry-pick

2011-08-26 Thread Michael Jansen
On Friday, August 26, 2011 01:28:01 PM Stephen Kelly wrote: > David Faure wrote: > > On Friday 26 August 2011 12:04:29 Stephen Kelly wrote: > >> Hi, > >> > >> I merged the 4.7 branch into frameworks recently. Now it's easy to merge > >> again, so no need to cherry-pick when you fix things in 4.7.

Re: 4.7 mergable into frameworks. No need to cherry-pick

2011-08-26 Thread Stephen Kelly
David Faure wrote: > On Friday 26 August 2011 12:04:29 Stephen Kelly wrote: >> Hi, >> >> I merged the 4.7 branch into frameworks recently. Now it's easy to merge >> again, so no need to cherry-pick when you fix things in 4.7. You can >> merge instead. > > OK, how do I do that exactly? Commit in

Re: 4.7 mergable into frameworks. No need to cherry-pick

2011-08-26 Thread David Faure
On Friday 26 August 2011 12:04:29 Stephen Kelly wrote: > Hi, > > I merged the 4.7 branch into frameworks recently. Now it's easy to merge > again, so no need to cherry-pick when you fix things in 4.7. You can merge > instead. OK, how do I do that exactly? Commit in 4.7, fetch in frameworks, then

4.7 mergable into frameworks. No need to cherry-pick

2011-08-26 Thread Stephen Kelly
Hi, I merged the 4.7 branch into frameworks recently. Now it's easy to merge again, so no need to cherry-pick when you fix things in 4.7. You can merge instead. Thanks, Steve.