From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 30871 invoked by alias); 9 Mar 2006 21:18:47 -0000 Received: (qmail 30858 invoked by uid 22791); 9 Mar 2006 21:18:46 -0000 X-Spam-Check-By: sourceware.org Received: from londo.lunn.ch (HELO londo.lunn.ch) (80.238.139.98) by sourceware.org (qpsmtpd/0.31) with ESMTP; Thu, 09 Mar 2006 21:18:45 +0000 Received: from lunn by londo.lunn.ch with local (Exim 3.36 #1 (Debian)) id 1FHSWp-00037I-00; Thu, 09 Mar 2006 22:18:35 +0100 Date: Thu, 09 Mar 2006 21:18:00 -0000 To: Grant Mills Cc: eCos Discussion Message-ID: <20060309211835.GN19406@lunn.ch> Mail-Followup-To: Grant Mills , eCos Discussion References: <6f506bf60603081121ga5a3c2cs925c9ad4362198ad@mail.gmail.com> <20060308195825.GC19406@lunn.ch> <6f506bf60603081221s3564106agd31024b507ccdd7a@mail.gmail.com> <20060308220250.GE19406@lunn.ch> <6f506bf60603081426j4ec71e7dg1f068b4f42ad4b17@mail.gmail.com> <20060308223947.GH19406@lunn.ch> <6f506bf60603082209g3c434909rebe1c139b26dc03c@mail.gmail.com> <20060309205801.GL19406@lunn.ch> <6f506bf60603091309u3b2cc4d7kd4a9b06f01956d3d@mail.gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <6f506bf60603091309u3b2cc4d7kd4a9b06f01956d3d@mail.gmail.com> User-Agent: Mutt/1.5.11+cvs20060126 From: Andrew Lunn X-IsSubscribed: yes Mailing-List: contact ecos-discuss-help@ecos.sourceware.org; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: ecos-discuss-owner@ecos.sourceware.org Subject: Re: [ECOS] Modifying RedBoot to support multiple flash devices X-SW-Source: 2006-03/txt/msg00112.txt.bz2 > 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