[Tinyos Core WG] HEAD/DEVEL swap done

[Vlado Handziski]

The swap is completed.

At the and it took a lot of hand merging since not all changes from
tinyos-2-0-0-release were propagated back to DEVEL as agreed and as I have
requested couple of days ago.

I sincerely hope that I was able to bring the HEAD to the most logical
state. The ultimate responsibility for solving any problems are with the
ones that made changes to the same file both on the release and the DEVEL
branches :))

The main point:

When creating branches (like the tinyos-2-0-0-release) ALWAYS create a tag
first in the parent branch (a different one then the branching tag which is
"moving" and pointing to the top of the branch). Also, before merging
changes on a branch back to another branch, again ALWAYS tag the top of the
branch.

This is the only way to make repeated merging from a branch back to HEAD
possible.

Vlado

P.S. I am passing the CVS merging token to someone else. Doing this once was
one time too many :)

Vlado
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.millennium.berkeley.edu/pipermail/tinyos-2.0wg/attachments/20061213/ab365915/attachment.htm