[z3-five] Cleaning up branches

[Martijn Faassen]

Hey,

Philipp von Weitershausen wrote:

Hey Philipp, thanks for looking through this!

I'll just list the ones I know can be safely removed as I moved them
into the trunk recently:

> regebro-menudirectives 
 > regebro-forms_support
 > regebro-z2_templates

I'm not sure about this one:

 > regebro-layer_from_directory

Lennart?

This one, I'm still working on, so don't remove it as I may want to 
consult it:

> regebro-addform_directive 

Now finally to the traversal issue:

> dc-traversal-issue
> 
> Please let me know if any of these are still needed. Specifically,
> I'd like to know the status of dc-traversal-issue (whether the
> changes that made Five work with Zope 2.7.4 correctly have been
> merged to the trunk). I plan to delete all unneeded branches.

I haven't done any work on dc-traversal; perhaps someone more
knowledgable about this can merge it into the trunk with, I hope, a 
test. (as long as it's not the hack involving checking the caller that 
we discussed before, but I believe we moved beyond that). The traversal 
bug (docstring error instead of not found) still exists on Five-trunk.

Note that I am aiming to release a Five 0.3 soon. There are quite a few 
great new features, thanks to Lennart's efforts mostly. I'll call it 
Five 0.3 and not beta, as we can always do a 0.3.1 if there are bugs, 
and last time we stayed in that beta phase forever.

Regards,

Martijn