[mc1322x] Contiki tree resync

[Jon Smirl]

On Wed, Oct 28, 2009 at 4:09 PM, Mariano Alvira <mar at devl.org> wrote:
> 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.

It would be best to sync up with Contiki CVS once every week or so.
It's not that we need the code from Contiki that often, it's so that
we'll quickly become aware of changes to Contiki that could render
this code unmergable.

If you'd been syncing once a week you would have quickly noticed the
CVS keyword expansion issue. I was already familiar with the problems
caused by keyword expansion and knew how to fix it.

You don't need two repositories, use branches.  CVS import should be
one branch, then your two versions of the code would be two other
branches. Change your .git/config to push all branch heads.

[remote "digispeaker"]
        url = ssh://....
        fetch = +refs/heads/*:refs/remotes/digispeaker/*
        push = +refs/heads/*

When the branches are in the server they'll automatically show in gitweb.


>
> 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.
>



-- 
Jon Smirl
jonsmirl at gmail.com