From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6226 invoked by alias); 1 Dec 2010 16:10:28 -0000 Received: (qmail 6217 invoked by uid 22791); 1 Dec 2010 16:10:26 -0000 X-SWARE-Spam-Status: No, hits=-0.8 required=5.0 tests=AWL,BAYES_20,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from hermes.mlbassoc.com (HELO mail.chez-thomas.org) (64.234.241.98) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 01 Dec 2010 16:10:21 +0000 Received: by mail.chez-thomas.org (Postfix, from userid 999) id 56F80166084C; Wed, 1 Dec 2010 09:10:19 -0700 (MST) Received: from hermes.chez-thomas.org (hermes_local [192.168.1.101]) by mail.chez-thomas.org (Postfix) with ESMTP id 0E5FE166084A; Wed, 1 Dec 2010 09:10:19 -0700 (MST) Message-ID: <4CF6736A.9010400@mlbassoc.com> Date: Wed, 01 Dec 2010 16:10:00 -0000 From: Gary Thomas User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.9) Gecko/20100430 Fedora/3.0.4-2.fc11 Thunderbird/3.0.4 MIME-Version: 1.0 To: bob.brusa@gmail.com CC: ecos-discuss References: In-Reply-To: Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit Mailing-List: contact ecos-discuss-help@ecos.sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: ecos-discuss-owner@ecos.sourceware.org Subject: Re: [ECOS] [ecos-discuss] invalid ecos.db following cvs-update X-SW-Source: 2010-12/txt/msg00004.txt.bz2 On 12/01/2010 09:05 AM, Bob Brusa wrote: > Hi > under windows xp with cygwin, I entered the command > cvs -z3 update -d -P > It goes through without error messages, but I end up with an > ecos.db-file that is refused by configtool. > > The file starts with a sequence of >>>>>>> and also includes many cr > (ASCII '\0x0a'). The usual header (comment-section at the beginning of > the file) is missing. What went wrong and how can i fix this? This indicates you had a conflict in merging the changes to that file, most likely stemming from local changes to the file. The easiest thing would be to do something like this: % mv ecos.db ecos.db.BAD % cvs up ecos.db Then manually compare them and figure out how to merge your changes into the master. -- ------------------------------------------------------------ Gary Thomas | Consulting for the MLB Associates | Embedded world ------------------------------------------------------------ -- Before posting, please read the FAQ: http://ecos.sourceware.org/fom/ecos and search the list archive: http://ecos.sourceware.org/ml/ecos-discuss