[Ns-developers] gsoc wrapup

[Florian Westphal]

Tom Henderson <tomh at tomh.org> wrote:
> Mathieu Lacage wrote:
>> On Sun, 2008-08-17 at 12:34 +0200, Florian Westphal wrote:
>> I did a final review of the code and sent you a couple of comments
>> privately by email. Modulo a couple of very minor details, the code
>> looks good for merging to me so, feel free to try to push to ns-3-dev
>> when you are ready.
>
> It would be nice to try to resolve (or log into the tracker) the issues 
> quickly if possible so that it could be merged next week.  Raj, can you 
> please review as well?

Here is everything in a single patch:
http://www.strlen.de/cradle/ns-3-nsc-aug-22-2008.diff

It should apply cleanly to current ns-3-dev tip.

> Also, do the regression and unit test suites need a flag to remember 
> whether nsc has been enabled?

No, i removed all the nsc changes to the standard examples.
If they look different when nsc is enabled, its a bug.

> Regarding the merge of code like this, where someone has been working on a 
> project for many months with a long change history, should we be merging 
> repos with full change history or just producing a final patch that is 
> merged to ns-3-dev?  Is it author's discretion whether or not to keep 
> forever the private change history?

I already dumped some of the early changesets because I found it annoying
to look through a large history and you see dozens of back-and-forth
commits and reverts. So, personally I'd prefer to have a single commit,
or, if such a large commit is frowned upon, one larger patch that adds
the core files and another patch on top which adds the rest (wscript,
glue code to existing files).

Thanks to all reviewers for spending their time on this,
       Florian

Oh, by the way, I'll be offline next week. I'll work on any problems
and issues that may come up as soon as I get back.