[mc1322x] Contiki tree resync

[Jon Smirl]

On Wed, Oct 21, 2009 at 6:42 PM, Mariano Alvira <mar at devl.org> wrote:
> On Wed, Oct 21, 2009 at 11:15:15AM -0400, Jon Smirl wrote:
>> Are you planning on resyncing to the main Contiki repo any time soon?
>> You can get into a lot of merge problems if you wait too long before
>> syncing. Last sync was May 18.
>>
>> I'm still trying to sort out ipv6 on the cards. I'm missing fixes that
>> are later in the Contiki tree.
>
> Yes, I do want to do a resync soon. I haven't been waiting for any
> real reason --- I've just been a little busy. One "problem" I have is
> that I don't track the main Contiki in a git repo right now. Ideally
> I'd resync very often. So I'll probably try to setup something that
> tracks their cvs semi-automatically.

When you used git cvsimport it left some hidden files in your git tree.
If you rerun it from the same tree it will incrementally pick up the changes

>
> When I get back from Japan (in a few days) I hope to start working on
> our ethernet<->mc13224v gateway and so will also be working on ipv6 too.
>
>>
>> Life would be much easier if Contiki were on git.
>
> I agree.
>
> -Mar.
>



-- 
Jon Smirl
jonsmirl at gmail.com