[Tux4kids-tuxtype-dev] [Tuxmath-devel] libt4k_common update

[David Bruce]

Hi Brendan,

> Okay, I thought that might be the case. My only fear is that the
> changes I'm making are so drastic that they might be difficult to
> merge afterwards; but it'd definitely be nice to keep master stable
> for a change ;) I won't push anything, then.

To elaborate a bit, by all means push your work into the server's
"commonification" branch as you go - the value of having remote
branches is that we all can look at what has been done and contribute.

You should periodically check "master" to see if anything has gone in
since you branched off.  You should start each session with a "git
pull", which IIRC by default will pull in updates for all of your
local branches that are tracking remote (i.e. server-resident)
branches.  If "master" has changed, you can pull the new commits into
"commonification" by doing "git merge master" while you have
"commonification" checked out.  Or, to be careful, you can scrutinize
the new commits with "git diff" and drag in the ones you want, one at
a time, with "git cherry-pick <COMMIT SHA>".   If you keep
"commonification" up to date in this way, then when it is time to
merge back into "master" it should be conflict-free.

As for merging work from "commonification" back into "master", don't
really worry about it for now.  I think the key thing there that once
you have merged commits into your local checkout of "master", do some
testing to be sure everything works before pushing them into "master"
at Alioth.

> I did recently notice that input bug in TuxType; I wasn't sure whether
> it was only in my branch, because AFAIK the library doesn't have
> anything input-related, and if it does, it's certainly not being used.
> The source code hasn't really changed much at all, TBH. Oh, well, more
> fun to debug.

At least when I checked last night, it was only in the
"commonification" branch.  I didn't look to see what is different in
that branch, other than linking to libt4k - that is, I don't know
which of the lib functions are getting called instead of tuxtype's own
functions.  From what little checking I did with some debugging
statements, it seems that the SDL_KEYDOWN events aren't being received
in the main Fish Cascade game loop.

Best,

David