Yes that's probably the most pain free way without having to waste time merging back and forth.  Eventually I guess we will do the same thing that we did this past week: that is just replace the present trunk with the bigbang branches.

Alex

On Dec 13, 2007 7:48 PM, Enrique Rodriguez <enriquer9@gmail.com> wrote:
On Dec 13, 2007 4:42 PM, Emmanuel Lecharny <elecharny@gmail.com> wrote:
> ...
> Hope those explainations are clear enough :)

OK, so I'll continue to fix bugs against bigbang.

Enrique