You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cocoon.apache.org by Antonio Gallardo <ag...@agsoftware.dnsalias.com> on 2003/01/16 18:36:43 UTC
[CVS] - A rare message when downloading....
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?
Antonio Gallardo
---------------------------------------------------------------------
To unsubscribe, e-mail: cocoon-dev-unsubscribe@xml.apache.org
For additional commands, email: cocoon-dev-help@xml.apache.org
Re: [CVS] - A rare message when downloading....
Posted by Antonio Gallardo <ag...@agsoftware.dnsalias.com>.
Thanks Steve.
Antonio Gallardo.
Steven Noels dijo:
> Antonio Gallardo wrote:
>
>> Hi Steve:
>>
>> Sorry, but I dont understand the point. :-(
>>
>> Vadim told me that:
>>
>> "Conflict. Rename your .cvsignore, checkout, then you can merge." Then
>> I saw the file there in the cvs site. I dont understand if this is
>> correct or not.
>
> It is.
>
> You modified your local .cvsignore file, and CVS wasn't able to
> automagically merge with an updated version of .cvsignore from the
> repository.
>
> So Vadim suggested to rename your local copy so that it isn't in the way
> anymore, 'cvs update' so that you get the repository version of the
> file, and then you can manually merge the differences between both.
> There even exist conflict editors for such a purpose:
> http://sourceforge.net/projects/conflicteditor
>
> HTH,
>
> </Steven>
> --
> Steven Noels http://outerthought.org/
> Outerthought - Open Source, Java & XML Competence Support Center
> Read my weblog at http://blogs.cocoondev.org/stevenn/
> stevenn at outerthought.org stevenn at apache.org
>
>
> --------------------------------------------------------------------- To
> unsubscribe, e-mail: cocoon-dev-unsubscribe@xml.apache.org
> For additional commands, email: cocoon-dev-help@xml.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: cocoon-dev-unsubscribe@xml.apache.org
For additional commands, email: cocoon-dev-help@xml.apache.org
Re: [CVS] - A rare message when downloading....
Posted by Steven Noels <st...@outerthought.org>.
Antonio Gallardo wrote:
> Hi Steve:
>
> Sorry, but I dont understand the point. :-(
>
> Vadim told me that:
>
> "Conflict. Rename your .cvsignore, checkout, then you can merge."
> Then I saw the file there in the cvs site. I dont understand if this is
> correct or not.
It is.
You modified your local .cvsignore file, and CVS wasn't able to
automagically merge with an updated version of .cvsignore from the
repository.
So Vadim suggested to rename your local copy so that it isn't in the way
anymore, 'cvs update' so that you get the repository version of the
file, and then you can manually merge the differences between both.
There even exist conflict editors for such a purpose:
http://sourceforge.net/projects/conflicteditor
HTH,
</Steven>
--
Steven Noels http://outerthought.org/
Outerthought - Open Source, Java & XML Competence Support Center
Read my weblog at http://blogs.cocoondev.org/stevenn/
stevenn at outerthought.org stevenn at apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: cocoon-dev-unsubscribe@xml.apache.org
For additional commands, email: cocoon-dev-help@xml.apache.org
Re: [CVS] - A rare message when downloading....
Posted by Antonio Gallardo <ag...@agsoftware.dnsalias.com>.
Hi Steve:
Sorry, but I dont understand the point. :-(
Vadim told me that:
"Conflict. Rename your .cvsignore, checkout, then you can merge."
Then I saw the file there in the cvs site. I dont understand if this is
correct or not.
Antonio.
Steven Noels dijo:
> Antonio Gallardo wrote:
>
>> Is correct that in:
>>
>> http://cvs.apache.org/viewcvs.cgi/xml-cocoon2/
>>
>> There is a .cvsignore 2 weeks old?
>
> compare
> http://marc.theaimsgroup.com/?l=xml-cocoon-cvs&m=104150462825104&w=2
> with
> http://cvs.apache.org/viewcvs.cgi/xml-cocoon2/.cvsignore?rev=1.9&content-type=text/vnd.viewcvs-markup
>
> Yes, this seems the case.
>
> </Steven>
> --
> Steven Noels http://outerthought.org/
> Outerthought - Open Source, Java & XML Competence Support Center
> Read my weblog at http://blogs.cocoondev.org/stevenn/
> stevenn at outerthought.org stevenn at apache.org
>
>
> --------------------------------------------------------------------- To
> unsubscribe, e-mail: cocoon-dev-unsubscribe@xml.apache.org
> For additional commands, email: cocoon-dev-help@xml.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: cocoon-dev-unsubscribe@xml.apache.org
For additional commands, email: cocoon-dev-help@xml.apache.org
Re: [CVS] - A rare message when downloading....
Posted by Steven Noels <st...@outerthought.org>.
Antonio Gallardo wrote:
> Is correct that in:
>
> http://cvs.apache.org/viewcvs.cgi/xml-cocoon2/
>
> There is a .cvsignore 2 weeks old?
compare
http://marc.theaimsgroup.com/?l=xml-cocoon-cvs&m=104150462825104&w=2
with
http://cvs.apache.org/viewcvs.cgi/xml-cocoon2/.cvsignore?rev=1.9&content-type=text/vnd.viewcvs-markup
Yes, this seems the case.
</Steven>
--
Steven Noels http://outerthought.org/
Outerthought - Open Source, Java & XML Competence Support Center
Read my weblog at http://blogs.cocoondev.org/stevenn/
stevenn at outerthought.org stevenn at apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: cocoon-dev-unsubscribe@xml.apache.org
For additional commands, email: cocoon-dev-help@xml.apache.org
Re: [CVS] - A rare message when downloading....
Posted by Antonio Gallardo <ag...@agsoftware.dnsalias.com>.
Is correct that in:
http://cvs.apache.org/viewcvs.cgi/xml-cocoon2/
There is a .cvsignore 2 weeks old?
Antonio Gallardo
Vadim Gritsenko dijo:
> 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
---------------------------------------------------------------------
To unsubscribe, e-mail: cocoon-dev-unsubscribe@xml.apache.org
For additional commands, email: cocoon-dev-help@xml.apache.org
Re: [CVS] - A rare message when downloading....
Posted by Vadim Gritsenko <va...@verizon.net>.
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