[Tinyos Core WG] Updates to BlockStorage

Philip Levis pal at cs.stanford.edu
Thu Sep 21 16:26:07 PDT 2006


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


More information about the Tinyos-2.0wg mailing list