[ECOS] Modifying RedBoot to support multiple flash devices
Thu Mar 9 21:18:00 GMT 2006
> Basically the -j switch merges the specified revision (flash_v2,
> but it's a branch tag so cvs takes the tips of the branch) into the
> current sandbox, which for me is HEAD/tip/trunk. So I've effectively
> brought the flash_v2 changes to the tip.
> There were some conflicts, most were in the ChangeLog files.
> That's expected because cvs detected different changes in the same
> space. There were a few in the code and I'll sort through those
> before I build.
> Would anybody be interested in a report on the conflicts?
When the FSF thing finally happens i would be interested in your
conflict resolved tree.
Before posting, please read the FAQ: http://ecos.sourceware.org/fom/ecos
and search the list archive: http://ecos.sourceware.org/ml/ecos-discuss
More information about the Ecos-discuss