4.7 mergable into frameworks. No need to cherry-pick

[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. You can
> >> merge instead.
> > 
> > OK, how do I do that exactly? Commit in 4.7, fetch in frameworks, then
> > what? git merge KDE/4.7?
> 
> git checkout KDE/4.7
> vi somefile
> git commit -am hacking
> git push
> git checkout frameworks
> git merge KDE/4.7
> git push
> 
> 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.

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.

Somehow people thought it was not necessary.

Sigh

Mike

-- 
Michael Jansen
http://michael-jansen.biz