[mc1322x] Contiki tree resync

[Mariano Alvira]

On Wed, Oct 21, 2009 at 11:53:59PM -0400, Jon Smirl wrote:
> We need to work on getting the Contiki tree fixed up. I'm unable to
> merge it back with the current Contiki trunk. 

Ok, I've done some work on this and I think we are in better shape
now. I have two new contiki-upstream repositories now, one with
expanded keywords and one without. I updated contiki-mc1322x using the
expanded tree, and then unexpanded the keywords in a similar way that
you did. Then I merged in the upstream tree without the expanded
keywords and fixed the conflicts.

In short, you can now sync up to upstream with:

  git clone git://git.devl.org/git/malvira/contiki-mc1322x
  git clone git://git.devl.org/git/malvira/contiki-upstream
  cd contiki-upstream
  git cvsimport -v -k -d:pserver:anonymous at contiki.cvs.sourceforge.net:/cvsroot/contiki contiki-2.x
  cd ../contiki-mc1322x
  git pull ../contiki-upstream master

and at that point all the conflicts should be real issues that we need
to either fix on our end or by pushing a fix upstream...

I'll keep contiki-upstream-expanded around for a while, but we
shouldn't need it anymore.

-Mar.