[Tinyos Core WG] Subversion, was Re: Updates to BlockStorage

[Cory Sharp]

On 9/21/06, Philip Levis <pal at cs.stanford.edu> wrote:
>
> On Sep 21, 2006, at 4:10 PM, David Gay wrote:
>
> > I've made the changes to BlockStorage discussed at the last telecon
> > for the at45db, they're checked in to the devel branch (I considered
> > making a different branch for it, but then only people with access to
> > the head would have access to it, if I understand CVS access control
> > correctly (doubtful)).
> >
> > Note to Phil: can you send the list a summary of current CVS usage
> > procedures? I'm completely confused now :-)
> >
>
> Basically, the two rules are this:
>
> Updates to the HEAD should either be little things that won't cause
> inconsistencies (e.g., spelling mistakes, typos, localized bug fixes)
> or be consistent updates from -devel. Basically, the HEAD should be a
> consistent set of code. If you want to update HEAD, the preferred way
> to do it is to update -devel and then merge over. The goal is that
> the HEAD should be something someone can check out and have a stable
> and working set of code with consistent documentation. So, updating
> TEP103 on HEAD but then checking in the code on -devel is kind of
> sketchy. So is (given it's not 100% final) checking in the code on
> HEAD. So right now, keep stuff on -devel.
>
> -devel is the active development branch. You should feel free to
> check changes in here. It is OK to have partially finished code. But
> as people actively use this, it is generally not OK to check in
> partially completed changes that break everything for everyone else.
> If you're doing something really big and want to be able to check in
> intermediate stages, then you have two options: 1) use a branch or 2)
> use tinyos-2.x/experimental/ (which has yet to be created).
> Basically, just use -devel as we have, be considerate of others, etc.
>
> Phil


I don't currently heavily access the TinyOS 2.x repository, so take this
message for whatever it's worth.  But, it sounds like in this strategy being
able to use branches more effectively could help a lot.  Subversion makes
branches really easy (svn copy, svn merge, and svn switch are all you
need).  You could reasonably experiment with Subversion by treating the SVN
tinyos-2.x/trunk just like the CVS tinyos-2.x HEAD.  Then, folks could use
subversion to branch, develop, and merge against trunk.  I suppose keeping
the CVS HEAD and SVN trunk consistent could become a headache.  But, I only
mention it because branching and merging in SVN is way easy, and the
benefits may outweigh the pain.

Cory
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.millennium.berkeley.edu/pipermail/tinyos-2.0wg/attachments/20060921/0bcd756c/attachment.html