Am 09.01.2015, 16:54 Uhr, schrieb Alan Hourihane:
The way to do it would be to merge the trunk into your branch first, then carry on testing to ensure no breakage from the trunk.
I wanted to do that this year. I don't want to just copy the trunk-things over, esp. I don't want 1024 static file-handles for every process, I think there is a better way, but not sure.
Then it's much easier to merge your branch back to the trunk as there should be only your changes being merged. Do you want to merge from the trunk first ?
If people would test my kernel/XaAES and report back, I would know what to do first, but I can't promise any prompt reaction.
-Helmut --