State of the current cvs branches?

Hi,

 I am currently a little confised aboput the current state for the
different formulator branches.

 On the formulator-general there have been quite a few bug reports and
patches some of them I would like to patch / fix on the current HEAD. 
On the other hand there are some larger changes at least on the
"faassen-validation-branch"; e.g. converting the tests to use
ZopeTestCase.

 As there are no "critical" bugs in the list of the pending fixes I
could get fixed I currently stay away from applying the changes to avoid
unnecessary conflicts when merging the current branches. Especially
I woulf like to add test cases to make sure some of the patches really
fix something and this stays fixed. Obviously this will conflict with
the reorganization of the tests on the branch.
 However I wonder if or when a merge is actually planned.
  
 So the question is if it is ok to apply any changes to the current HEAD
except those which are really fixing critical stuff. 

 Personally I am not in a hurry about the issue, as I will not have the
time to look into the patch-list in the next two weeks anyway.

Cheers
Clemens