From: "Ferry Huberts (Pelagic)" <ferry.huberts@pelagic•nl>
To: Heiko Voigt <hvoigt@hvoigt•net>
Cc: Junio C Hamano <gitster@pobox•com>, git@vger•kernel.org
Subject: Re: [PATCH] Add warning about known issues to documentation of cvsimport
Date: Tue, 31 Mar 2009 19:10:14 +0200 [thread overview]
Message-ID: <49D24E76.60904@pelagic.nl> (raw)
In-Reply-To: <20090331162103.GA72569@macbook.lan>
Heiko Voigt wrote:
> 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.
> +
>
I can agree with this. However,
I still think that this is too weak a statement and a bit too cryptic:
the import will/can actually fail when a crlf conversion is performed,
even though safecrlf is not set to true. At least that was the case I
was talking about in the thread. I don't know the current situation, I
haven't tried it since 'cause I just use it with both set to false :-)
I discussed a patch for this but never got around to implementing it
since I'm now busy with ignore functionality for EGit.
cheers.
Ferry
next prev parent reply other threads:[~2009-03-31 17:11 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-23 19:53 [PATCH] Add warning about known issues to documentation of cvsimport Heiko Voigt
2009-03-23 20:33 ` Ferry Huberts (Pelagic)
2009-03-30 22:17 ` Heiko Voigt
2009-03-31 5:36 ` Ferry Huberts (Pelagic)
2009-03-31 16:22 ` Heiko Voigt
2009-03-31 16:53 ` [PATCH] cvsimport: Add a note about crlf options to the documentation Heiko Voigt
2009-03-31 17:10 ` Ferry Huberts (Pelagic) [this message]
2009-03-24 3:14 ` [PATCH] Add warning about known issues to documentation of cvsimport Jeff King
2009-03-30 22:36 ` Heiko Voigt
2009-03-31 0:51 ` Junio C Hamano
2009-03-31 16:45 ` [PATCH] Cleanup warning about known issues in cvsimport documentation Heiko Voigt
2009-03-31 19:49 ` Jeff King
2009-04-01 20:24 ` [PATCH v2] " Heiko Voigt
2009-03-31 11:28 ` [PATCH] Add warning about known issues to documentation of cvsimport Jeff King
2009-03-31 19:40 ` Jeff King
2009-03-31 23:55 ` Junio C Hamano
2009-04-01 8:50 ` [PATCH] Documentation: use "spurious .sp" XSLT if DOCBOOK_SUPPRESS_SP is set Chris Johnsen
2009-04-01 10:14 ` Jeff King
2009-04-02 5:25 ` Junio C Hamano
2009-04-01 10:34 ` Jeff King
2009-04-01 12:19 ` Chris Johnsen
2009-04-01 13:06 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=49D24E76.60904@pelagic.nl \
--to=ferry.huberts@pelagic$(echo .)nl \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=hvoigt@hvoigt$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox