Re: [Ktechlab-devel] I'm a big dolt.

[Julian B. <ju...@sv...>]

On Monday 09 February 2009 18:07:13 Alan Grimes wrote:
> I just figured out how to grab the intended release branch. There are a
> number of important changes that I had intended for the branch that I
> had put in trunk.
I backported all bug-fixes into the branch. I saw you changed the declarations 
of some classes, I didn't backport them. These are new features (or better: 
API-changes) and shouldn't go into a branch during a release stabilisation. I 
also didn't backport the changes to the Makefile.am you did, since they intend 
to only fix some compiler warnings. Did I miss anything important? You can 
have a look at the last n commit messages by doing "svn log -l n" in an svn 
directory. 

> I would like to re synch all changes in the trunk
> through 193 into the branch.
That's only possible by manually copy the changes into the other branch. I 
suggest to leave the 0.3.7 branch as is and do another feature release soon 
(0.4.0), where your (non-bug-fix) changes to trunk will be in. Doing so, we 
can be sure no unwanted changes are made to the branch we are going to release 
in the next days. Only bug-fixes. So the 0.3.7 should change as little as 
possible. There are so many ways to bring new bugs into the software (if you 
remember the grey LED bug..) just by commiting some code clean-up or so.

bye then
julian