This is the mail archive of the
ecos-discuss@sources.redhat.com
mailing list for the eCos project.
Re: Modify the sources in eCos packages
- To: honda at itri dot org dot tw
- Subject: Re: [ECOS] Modify the sources in eCos packages
- From: Jonathan Larmour <jlarmour at redhat dot com>
- Date: Mon, 21 May 2001 15:18:53 +0100
- Cc: ecos-discuss at sources dot redhat dot com
- Organization: Red Hat UK Ltd.
- References: <OFD910D9D3.64855C89-ON48256A53.0029B9D3@oes.itri.org.tw>
honda@itri.org.tw wrote:
>
> I'm trying to port the eCos on the Cirrus Logic EDB7312. By the way, I've
> to add on option the configuration tools. Thus I modified the CDL file.and
> the sources in the packages. But it results that I cannot check out the new
> code. Is there any better way to maintain the code?
What you are probably seeing is a conflict resulting from you making a
change in the same area as someone else. The solution is to manually edit
the file and resolve the conflict by merging the two changes.
Jifl
--
Red Hat, Rustat House, Clifton Road, Cambridge, UK. Tel: +44 (1223) 271062
Maybe this world is another planet's Hell -Aldous Huxley || Opinions==mine