[Ns-developers] How to maintain a repository for merge

[Tom Henderson]

Mirko Banchi wrote:
> Hi all,
> 
> i'm working to 802.11e/n support and i'd like to know how you prefer i
> maintain my mercurial repository in order to make a possible future
> merge easier than possible. Could a tag for every milestone be enough?
> Or do you prefer a single repository for each feature?
> 
> at http://code.nsnam.org/mirko/ns-3-80211n/
> you can find the code.
> 
> Thank you all,
> 
> Mirko
> 

I would suggest the following:

- try to keep your repository in sync with ns-3-dev

- work with the maintainer to ask how he or she would like to proceed. 
For instance, do you agree on features, API, and general design? Can you 
define some merge points or milestones?  The maintainer should be able 
to help with overall schedule and merge considerations, deciding on 
whether separate repos are needed for each mergeable chunk, etc.

In your case, are you at the "agree on features, API, and general design 
stage" still?  I recall that you had asked some questions in your 
earlier post:
http://mailman.isi.edu/pipermail/ns-developers/2008-December/004973.html
and I am not sure what discussions you may have had at wns3 about some 
of these issues.

Can you suggest some natural milestones in the development that might 
make smaller and earlier merges possible?

- Tom