[Kde-games-devel] Merge frameworks in master

[laurent Montel]

Le Friday 02 January 2015 18:10:26 Ian Wadham a écrit :
> On 01/01/2015, at 7:42 PM, laurent Montel wrote:
> > Le Thursday 01 January 2015 14:45:50 Ian Wadham a écrit :
> >> Hi Jeremy,
> >> 
> >> On 01/01/2015, at 12:04 AM, Jeremy Whiting wrote:
> >>> On Tue, Dec 30, 2014 at 11:23 PM, laurent Montel <montel at kde.org> wrote:
> >>> 
> >>> Le Wednesday 31 December 2014 15:02:50 Ian Wadham a écrit :
> >>>>> So please, please hold your horses for now, Laurent… :-)  Please do
> >>>>> not
> >>>>> merge the frameworks branch into master.
> >>> 
> >>> I understand your concern for merging and having a kf5 codebase on
> >>> master
> >>> branches, but I also wonder if holding up the rest/all of kdegames for
> >>> osx is a good idea or not.
> >> 
> >> That was certainly not my intention.  See my latest reply to Laurent.
> >> 
> >>> You and others with interest/time to spend on kdelibs4 versions of the
> >>> games could still build and run them built from the Applications/14.12
> >>> branch (and put bug fixes there also to be forward ported to master) for
> >>> the forseeable future if you want to do it that way. Personally I have
> >>> no
> >>> opinion either way and have no decision making power as I don't maintain
> >>> any kdegames applications, but thought I'd put that out there as an
> >>> option.
> >> 
> >> That is an idea, but only for bug fixes.  Also I could just go back to
> >> local repositories or tags maybe, then just release patches "downstream"
> >> to MacPorts on Apple OS X.
> >> 
> >> The danger in that is that things that are fixed/improved in KDE 4 will
> >> reappear as unfixed/unimproved in KF5/Frameworks/Qt5, when we eventually
> >> get them on the Apple OS X platform.
> > 
> > What is the problem ?
> 
> Lack of proficiency with git, I suppose.  It is my tenth source code control
> system and I am 76.  My first SCCS was in 1965-66… :-)  One's capacity to
> absorb such things diminishes with age… :-)
> 
> > You can use git merge to merge change from your branch to kf5 no ?
> > (I do it each day with kdepim*)
> 
> My only branch so far has been master, with occasional backporting of bug
> fixes into release branches.  I had a look at kdepim* repositories, but
> could not get any idea of what your typical workflows are.

If you want to merge your code from 4.14 to master
You just write : git pull && git merge origin/KDE/4.14

=> you can merge your fixes in current branch (your current branch can be 
“master” or “frameworks”

I do it each day for merge my fixes from kde-4.14 to master (which is 
frameworks code) in kdepim*

It's not a problem for me if you want that I merge your code from 4.14 to 
master or frameworks.

Regards

> 
> Cheers, Ian W.
> Senior Software Engineer (retired)… :-)

-- 
Laurent Montel | laurent.montel at kdab.com | KDE/Qt Senior Software Engineer
KDAB (France) S.A.S., a KDAB Group company
Tel. France +33 (0)4 90 84 08 53,  http://www.kdab.fr