Starting the merge from trunk to stable

[Mark Heily]

I have started the merge process from trunk to stable. SVN commit
notifications are turned off, because I plan to make many small
commits rather than one big merge. This will help us find any bugs
that may be introduced. If you are interested in watching the changes,
you can checkout the branch named "branches/trunk-merge".

- Mark

[Marius Zwicker]

I am currently investigating the outcome of switching xdispatch to the
upstream stable branch of libkqueue. However I am dependant on the
windows support currently available within the trunk only.

Roughly a month has passed since you started merging the libkqueue trunk
to stable. I was wondering what the current status of
branches/trunk-merge is? How much work was done and how much is still
waiting? What is your opinion concerning the stability of this branch?

Thanks,

--

Marius Zwicker B.Sc.


MLBA - TEAM
www.mlba-team.de

PGP 8843 4AEF 1993 DD73 9358 22A1 9FBB 936E E09F 097D
X.509 C3:23:E9:B3:C1:23:4F:A6:20:DF:86:A8:7B:30:9E:30:49:C5:9E:53

[Mark Heily]

On Sat, Nov 24, 2012 at 5:25 PM, Marius Zwicker <mar...@mlba-team.de> wrote:

Am 28.10.2012 14:35, schrieb Mark Heily:

> I have started the merge process  from trunk to stable. SVN commit
> notifications are turned off, because I plan to make many small
> commits rather than one big merge. This will help us find any bugs
> that may be introduced. If you are interested in watching the changes,
> you can checkout the branch named "branches/trunk-merge".
>
>  - Mark
>

I am currently investigating the outcome of switching xdispatch to the
upstream stable branch of libkqueue. However I am dependant on the
windows support currently available within the trunk only.

Roughly a month has passed since you started merging the libkqueue trunk
to stable. I was wondering what the current status of
branches/trunk-merge is? How much work was done and how much is still
waiting? What is your opinion concerning the stability of this branch?

The merge was completed, however the resulting libkqueue library caused failures in the libdispatch testsuite. There are a lot of differences between the stable branch and the trunk, and it was not easy to merge the two. I gave up on debugging the problem, as it was not reproducible in the libkqueue testsuite. Therefore, I think the best option now is to fix the problems in the trunk and make a version 2.0 release from the trunk.

I have removed fine-grained locking from the trunk, so now I think it is okay to start using the trunk again for "serious" work. There are some small fixes in the stable branch that need to be replicated to the trunk, but that should not be too hard. I also need to switch to using Makeconf in the trunk, so it can build on Android.

I think that xdispatch should continue to use the libkqueue trunk, as I will not be making any more major changes to the stable branch. 

Regards,

 - Mark