Re: [lwip-members] commits

[Leon Woestenberg]

Hello,

Kieran, thanks for the clear explanation. What you describe is exactly what
has been done and what is the plan, with a small sidenote:

Instead of stabilizing the development tree, we might see if we can merge
bug fixes from development into stable, as de stable tree deserves to be
bug free as much as possible.

Regards,

Leon.

> > Hi Leon
> > do we need to check out separate dev and stable branches?
> > I keep commiting to the tree I checked out last week but I am not sure
> > whether this is the stable or the dev one...
>
> What I thought was going to happen (although I don't know if this is the
> case) is something along the lines of:
>
>  - development tree is made stable, and a "stable snapshot" is taken by
> branching.
>
>  - the stable snapshot is then largely untouched, with only severe bug
> fixes being made to it.
>
>  - any feature changes and bug fixes are added to the development tree
>
>  - at some point we decide that we need to make another stable branch, and
> so work towards making the development tree stable again (ie. a freeze on
> new features).
>
> This then repeats.  I guess this is pretty much the way lwIP was released
> when it was just Adam working on it, and also the way projects such as
> Debian are organised.
>
> If this is the way it is being done (and Leon might say it's actually
> something completely different) then by default I think the developers
> changes should go into the development tree, and the stable branch is made
> from that every time.  If you want to add changes to the stable branch, it
> should be non-default behaviour, and you should have to do more typing.
>
> This has the advantage that you should never need to merge changes back
> from the stable branch into the development tree, but has the disadvantage
> that we have to keep making the development tree stable.
>
> Kieran
>
>
>
> _______________________________________________
> lwip-members mailing list
> address@hidden
> http://mail.nongnu.org/mailman/listinfo/lwip-members
>