2011/10/14 Mark Thomas <ma...@apache.org>: > On 14/10/2011 15:00, Konstantin Kolinko wrote: >> 2011/10/14 Mark Thomas <ma...@apache.org>: > >>>> How? Some git push (or haw it is called there?) that writes directly >>>> to the repository? >>> >>> git svn dcommit >>> >>> See: >>> http://wiki.apache.org/general/GitAtApache >>> >>> I had been through the process once to reset the line endings in my >>> local repo and I though that would be enough. I think I know how to spot >>> this before it happens now so that should be the last of them. How to >>> fix it when I spot it is a separate issue. >>> >> >> Huh. >> I think the client (git) is broken if it does this. Another fault is >> that Subversion server allows it. >> >> You are on Windows, right? >> >> I reported the issue to users@subversion, >> http://subversion.markmail.org/thread/uovs5c7mgcnyp4an > > I think this was my fault. > > See http://stackoverflow.com/questions/1967370/git-replacing-lf-with-crlf > > Short version: > - files in svn might use either CRLF or LF > - eol-style: native just handles this > - git expects LF > - I had enabled core.autocrlf=true which changed everything to LF on commit > > I have set now core.autocrlf=false and that appears to have fixed things > so far... >
The file was actually sent to svn repository with CRLF line ends. (More discussion in the users@subversion thread in the link above). I reverted it to LFs in r1183612 by sending a non-changed file from TortoiseSVN. How do you run git? Do you use Cygwin, or maybe TortoiseGit? I think http://wiki.apache.org/general/GitAtApache might need to be updated to reflect the issue, but I am not yet sure what the correct setting is. Your last commits were OK. I hope infra people will install a pre-commit hook to prevent such commits from happening. One hook was already proposed in the thread above. Best regards, Konstantin Kolinko --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
