Hello!

I'd like to see the DFS branch finally merged into the trunk.  The  
longer we wait, the more differences appear between the branches, the  
harder it becomes to merge the changes.

I tried to reduce the differences today, but I only touched trivial  
differences.  All non-trivial changes should be merged by those who  
wrote the code, or it's likely that something will be mismerged.

Are there any problems with the DFS branch?  It there any reason why  
we don't want to merge it to the trunk?  Are there any parts that can  
be merged now?

I'm concerned that the differences keep growing.  There are changes on  
the DFS branch that should not be there, such as improvements to debug  
macros or changes to rate control algorithms.  In one case,  
conflicting changes were made to the ONOE rate control algorithm.

I'd like to see changes in topic branches limited to their topics.   
All other changes should be applied to the trunk first, so that they  
are done in a synchronized manner.  Those changes could then be merged  
to the topic branches.

We could create a git mirror for those who wants personal branches,  
but topic branches are not personal branches.

As it stands now, I'm afraid we are well beyond the point where we can  
trust merging the remaining differences to any version control  
software.  It has to be manual.  But let's try to avoid it in the  
future.

-- 
Regards,
Pavel Roskin

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/