You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by scirocco paptimus <pa...@gmail.com> on 2007/08/30 09:27:33 UTC
cvs2svn+revert whats happen?
Hi there.
what is happen?
% svn revert xxxxx2.cpp <----------- whim:-)
---------------------
(1) yesterday
% ver
Microsoft Windows XP [Version 5.1.2600]
% svn --version
svn, version 1.4.5 (r25188)
compiled Aug 22 2007, 20:49:04
(windows native)
% python cvs2svn.py --dumpfile=... (cvs2svn-2.0.0)
% svnadmin load ....
% svn co ....
% file xxxxx2.cpp
xxxxx2.cpp: Non-ISO extended-ASCII C++ program text, with LF, NEL line
terminators
====
oops!
---------------------
(2) today
% ver
Microsoft Windows XP [Version 5.1.2600]
% svn --version
svn, version 1.4.5 (r25188)
compiled Aug 22 2007, 20:49:04
(windows native)
% python cvs2svn.py --default-eol=CRLF --dumpfile=...
==================
% svnadmin load ....
% svn co ....
% file xxxxx2.cpp
xxxxx2.cpp: Non-ISO extended-ASCII C++ program text, with CRLF, NEL
line terminators
======
% svn diff xxxxx2.cpp
Index: xxxxx2.cpp
===================================================================
--- xxxxx2.cpp (revision 117)
+++ xxxxx2.cpp (working copy)
@@ -1,10563 +1,10563 @@
-/*----------------------------------------------------------------------
- * xxxx2
(all the end of line is different. LF<->CRLF)
% copy xxxxx2.cpp xxxxx2.cpp.co
% diff xxxxx2.cpp xxxxx2.cpp.co
(no difference)
% svn revert xxxxx2.cpp <----------- whim:-)
% diff xxxxx2.cpp xxxxx2.cpp.co
(no difference)
% file xxxxx2.cpp
xxxxx2.cpp: Non-ISO extended-ASCII C++ program text, with CRLF, NEL
line terminators
======
% svn diff xxxxx2.cpp
(no difference)
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: cvs2svn+revert whats happen?
Posted by scirocco paptimus <pa...@gmail.com>.
I solved.
there are another reason.
sorry. I did not wrote:
I copied an original file onto my working copy, retain the time stamp.
then, .svn was confused.
2007/8/30, Ulrich Eckhardt <ec...@satorlaser.com>:
> On Thursday 30 August 2007 11:27, scirocco paptimus wrote:
> > what is happen?
>
> Firstly, I'm not really sure what you expected to happen. Anyhow...
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: cvs2svn+revert whats happen?
Posted by Ulrich Eckhardt <ec...@satorlaser.com>.
On Thursday 30 August 2007 11:27, scirocco paptimus wrote:
> what is happen?
Firstly, I'm not really sure what you expected to happen. Anyhow...
> % svn co ....
>
> % file xxxxx2.cpp
> xxxxx2.cpp: Non-ISO extended-ASCII C++ program text, with CRLF, NEL
> line terminators
> ======
> % svn diff xxxxx2.cpp
> Index: xxxxx2.cpp
> ===================================================================
> --- xxxxx2.cpp (revision 117)
> +++ xxxxx2.cpp (working copy)
> @@ -1,10563 +1,10563 @@
> -/*----------------------------------------------------------------------
> - * xxxx2
> (all the end of line is different. LF<->CRLF)
>
> % copy xxxxx2.cpp xxxxx2.cpp.co
> % diff xxxxx2.cpp xxxxx2.cpp.co
> (no difference)
>
> % svn revert xxxxx2.cpp <----------- whim:-)
Okay, wait right here: you haven't made any changes to that file (or at least
you're not showing them), so what do you expect the 'svn revert' to do?
Two things:
1. Read what 'svn revert' does, as you are apparently confused about this.
2. What do you want to achieve? You were referring to two CVS conversions with
different line-endings. The conversions both replace the whole repository, so
there is no relation between them, but it seems to have been part of your
example. What were you trying to do?
Uli
--
Sator Laser GmbH
Geschäftsführer: Ronald Boers, Amtsgericht Hamburg HR B62 932
**************************************************************************************
Visit our website at <http://www.satorlaser.de/>
**************************************************************************************
Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empfänger sein sollten. Die E-Mail ist in diesem Fall zu löschen und darf weder gelesen, weitergeleitet, veröffentlicht oder anderweitig benutzt werden.
E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte Änderungen enthalten. Sator Laser GmbH ist für diese Folgen nicht verantwortlich.
**************************************************************************************
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org