[bind10-dev] The #356 and #408 branches

[wanghaidong]

Hi Michal:

It's OK for me.

Today, I will make some minor changes as Stephen's review feedback, then we can start to merge.

Best Regards
Ocean

> -----Original Message-----
> From: Michal 'vorner' Vaner [mailto:michal.vaner at nic.cz]
> Sent: Tuesday, December 07, 2010 12:29 AM
> To: Ocean
> Cc: Bind 10
> Subject: The #356 and #408 branches
> 
> Good morning
> 
> I brought the #408 branch to some preliminary review. It is not really ready to
> go to trunk, but is in working state, just missing more tests and so and it is
> getting big and there's lot of refactoring. Which will conflict with your work, so
> the merge will be fun.
> 
> However, I wondered if you mind that I would merge it (after the review) to
> #356 (resolve the conflicts and so) and then I would be adding the tests on the
> #356 branch. It would mean that you would have newer code (because there
> are many places where the code is different) and our branches wouldn't be
> diverging. On the other hand, it means we should read each others commits
> and try not to commit anything that is too much broken (does not compile or
> so). Would it be OK with you?
> 
> Thank you very much
> 
> With regards
> 
> --
> A nuclear war can ruin your whole day.
> 
> Michal 'vorner' Vaner