From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiko Voigt Subject: Re: [PATCH] Add warning about known issues to documentation of cvsimport Date: Tue, 31 Mar 2009 18:22:18 +0200 Message-ID: <20090331162103.GA72569@macbook.lan> References: <20090323195304.GC26678@macbook.lan> <49C7F233.9050205@pelagic.nl> <20090330221729.GB68118@macbook.lan> <49D1ABD0.8070707@pelagic.nl> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Junio C Hamano , git@vger.kernel.org To: "Ferry Huberts (Pelagic)" X-From: git-owner@vger.kernel.org Tue Mar 31 18:24:24 2009 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1Logko-0007Uo-51 for gcvg-git-2@gmane.org; Tue, 31 Mar 2009 18:23:58 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760354AbZCaQWW (ORCPT ); Tue, 31 Mar 2009 12:22:22 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1759775AbZCaQWW (ORCPT ); Tue, 31 Mar 2009 12:22:22 -0400 Received: from darksea.de ([83.133.111.250]:40179 "HELO darksea.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1757977AbZCaQWV (ORCPT ); Tue, 31 Mar 2009 12:22:21 -0400 Received: (qmail 14236 invoked from network); 31 Mar 2009 18:22:08 +0200 Received: from unknown (HELO localhost) (127.0.0.1) by localhost with SMTP; 31 Mar 2009 18:22:08 +0200 Content-Disposition: inline In-Reply-To: <49D1ABD0.8070707@pelagic.nl> User-Agent: Mutt/1.5.19 (2009-01-05) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On Tue, Mar 31, 2009 at 07:36:16AM +0200, Ferry Huberts (Pelagic) wrote: > Heiko Voigt wrote: > > On Mon, Mar 23, 2009 at 09:33:55PM +0100, Ferry Huberts (Pelagic) wrote: > >> maybe you can also add remarks about autocrlf and safecrlf? > >> both need to be off > > > > From my experience thats not necessarily true. You can use > > autocrlf=input to repair broken revisions were crlf's have been > > mistakenly committed into the repository. And if I remember correctly > > safecrlf helps if you want to make sure that no information gets lost. > > > > So when importing from a nice correct cvs repository you would expect > > safecrlf to not stop your import. And I suspect there are actually cvs > > users that were very careful with their lineendings who would use it. > > > > cheers Heiko > If you look at this thread: > http://thread.gmane.org/gmane.comp.version-control.git/110152/focus=110358 > you'll see why I said it. I did some testing to prove my statement. Well, from that thread I see my statement supported. It is not true that they *need* to be off. Maybe a statement that certain crlf settings are exclusive would be good, but I agree that should go into the config documentation. The main point I see here is that the User may not be aware that such a conversion is applied so something like this could help. cheers Heiko diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt index e1fd047..d4e7fd4 100644 --- a/Documentation/git-cvsimport.txt +++ b/Documentation/git-cvsimport.txt @@ -40,6 +40,11 @@ probably want to make a bare clone of the imported repository and use the clone as the shared repository. See linkgit:gitcvs-migration[7]. +Note: All revisions are imported using the index so settings of +core.autocrlf and core.safecrlf are applied. This way you can change or +safety check the import. If you do not want this make sure these options +are both set to false. + OPTIONS -------