[Ktechlab-devel] Summary of latest IRC discussions about KTechLab

[Zoltan Padrah]

2011/4/4 Julian Bäume <julian at svg4all.de>:
>> Next item: merging the simulator and the master branches
>>
>> It is useful to have all the codebase in the same tree, so it can be more
>> easily managed. Merging is not that trivial, as the source code for the
>> simulator has been re-imported to my simulator branch again, so if we want
>> to keep the git history, we need to fix the conflicts during merging. A
>> simpler solution would be to move all the simulator tree in a new
>> directory, rebase all the commits on that, and then merging should be
>> trivial. After having everything in the same tree, we can reorganize all
>> the source code.
>>
>> This needs some experimentation with git. Any tips are welcome.
>
> I read how to do such things on http://help.github.com/subtree-merge/ but
> seems, I am to late ;) I knew it was possible, somehow. Anyway, having in
> mind, that we want to cooperate with caneda on that, we might consider keeping
> the simulation branch separated and make a library out of it. I’m not sure, if
> a subtree-merge is reversable, so we might want to wait a little longer ;) But
> we can start working on making your code a library. It would be nice to have,
> even if we do the merge.
>

Basically the simulator is a (static) library in its current state. It
doesn't have a main function, only in the tests.


>> Finally: ktechplatform API stability
>
> Even worse, once running KDE4.6 you are forced to use 1.2 version and can’t go
> back. So it’s quite hard for me to test things with older versions.
>

I can test with older versions. Debugging is another story.