Return-Path: 
 <cocoon-dev-return-35257-apmail-xml-cocoon-dev-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-cocoon-dev-archive@xml.apache.org
Received: (qmail 10231 invoked by uid 500); 16 Jan 2003 18:40:02 -0000
Mailing-List: contact cocoon-dev-help@xml.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:cocoon-dev-help@xml.apache.org>
list-unsubscribe: <mailto:cocoon-dev-unsubscribe@xml.apache.org>
list-post: <mailto:cocoon-dev@xml.apache.org>
Reply-To: cocoon-dev@xml.apache.org
Delivered-To: mailing list cocoon-dev@xml.apache.org
Received: (qmail 10213 invoked from network); 16 Jan 2003 18:40:02 -0000
Message-ID: <3E26FC84.7070201@verizon.net>
Date: Thu, 16 Jan 2003 13:40:04 -0500
From: Vadim Gritsenko <vadim.gritsenko@verizon.net>
User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US;
 rv:1.2.1) Gecko/20021130
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: cocoon-dev@xml.apache.org
Subject: Re: [CVS] - A rare message when downloading....
References: <40782.10.0.0.1.1042738603.squirrel@ags01.agsoftware.dnsalias.com>
In-Reply-To: 
 <40782.10.0.0.1.1042738603.squirrel@ags01.agsoftware.dnsalias.com>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
X-Authentication-Info: Submitted using SMTP AUTH PLAIN at out001.verizon.net
 from [139.85.116.181] at Thu, 16 Jan 2003 12:40:04 -0600
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

Antonio Gallardo wrote:

>Hi.
>
>I am not a CVS expert. I am trying to update the CVS HEAD and I receive
>this message:
>
><snip>
>  ? .cvsignore
>  cvs server: Updating .
>  cvs update: move away ./.cvsignore; it is in the way
>  C .cvsignore
></snip>
>
>What it means?
>

Conflict. Rename your .cvsignore, checkout, then you can merge.

Vadim




---------------------------------------------------------------------
To unsubscribe, e-mail: cocoon-dev-unsubscribe@xml.apache.org
For additional commands, email: cocoon-dev-help@xml.apache.org