We have two issues currently extant: 1. Some files that were deleted in SVN history are still present in the Git HEAD 2. Some people are dissatisfied with the way line endings are handled, especially on Windows I didn't expect to spend my Thanksgiving vacation working on this stuff, but I am getting myself set up to diagnose and fix #1. I am not going to try to fix #2, mostly because it's too open-ended, and there isn't even a consensus in the community about what a fix should look like. If a consensus is formed around a desired outcome, I am willing to at _least_ help in an advisory capacity, in which case someone should send me a personal email. Thanks, Dave
On 27 November 2013 20:25, Dave Abrahams
1. Some files that were deleted in SVN history are still present in the Git HEAD [snip] I didn't expect to spend my Thanksgiving vacation working on this stuff, but I am getting myself set up to diagnose and fix #1.
FWIW I really don't mind the extra files in hash.
On Wed, Nov 27, 2013 at 3:25 PM, Dave Abrahams
We have two issues currently extant:
1. Some files that were deleted in SVN history are still present in the Git HEAD
Unless this effects more than the few header files in two libraries we already discussed, I don't think it is worth worrying about. You have already put in vast amounts of time on this project, and spending time with friends and family is worth more than a few extra files, IMO.
2. Some people are dissatisfied with the way line endings are handled, especially on Windows
I didn't expect to spend my Thanksgiving vacation working on this stuff, but I am getting myself set up to diagnose and fix #1.
I am not going to try to fix #2, mostly because it's too open-ended, and there isn't even a consensus in the community about what a fix should look like. If a consensus is formed around a desired outcome, I am willing to at _least_ help in an advisory capacity, in which case someone should send me a personal email.
That's fine. I'll propose renormalization in a separate thread, probably tomorrow. --Beman
On 27/11/2013 21:25, Dave Abrahams wrote:
2. Some people are dissatisfied with the way line endings are handled, especially on Windows
Here is my suggestion: all text files that do not explicitly need otherwise should have Unix line endings in the upstream repository. Example of text files that need Windows-style endings are .bat files. Windows users may then choose to automatically convert those files to Windows-style endings on checkout, or not. The point of this approach is that everything just works regardless of the setting you choose to use. I'm fairly sure that it is what has been implemented, except there are still some issues with git configuration. It is of course necessary to specify that autocrlf shouldn't mess with .bat files.
Mathias Gaunard
Here is my suggestion: all text files that do not explicitly need otherwise should have Unix line endings in the upstream repository. Example of text files that need Windows-style endings are .bat files.
I'm fairly sure that it is what has been implemented,
If so, it’s purely by accident. As I’ve repeated many times, the conversion moves the bytes verbatim from SVN to Git.
2. Some people are dissatisfied with the way line endings are handled,
especially on Windows
Here is my suggestion: all text files that do not explicitly need otherwise should have Unix line endings in the upstream repository. Example of text files that need Windows-style endings are .bat files.
Windows users may then choose to automatically convert those files to Windows-style endings on checkout, or not. The point of this approach is that everything just works regardless of the setting you choose to use.
+1 Philippe
participants (5)
-
Beman Dawes -
Daniel James -
Dave Abrahams -
Mathias Gaunard -
Philippe Vaucher