This is the mail archive of the ecos-discuss@sourceware.org mailing list for the eCos project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: Modifying RedBoot to support multiple flash devices

> Andrew,
>     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.
> 
> All,
>     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.

        Andrew

-- 
Before posting, please read the FAQ: http://ecos.sourceware.org/fom/ecos
and search the list archive: http://ecos.sourceware.org/ml/ecos-discuss
Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]