On Wed, May 21, 2008 at 12:33 AM, Tammo van Lessen <[EMAIL PROTECTED]> wrote:
> Hi, > > now that mod_dontdothat has been relaxed (at least for the eu mirror), > I'm running into CRLF issues. Any Git users around? > > (on win&linux:) > With core.autocrlf = false, everything works almost fine, except for > merging and diffing: In this case git does not recognize that not the > whole file has changed but only regions -> causing a > non-trivial-conflict. > > If I change core.autocrlf to input or true, each fresh checkout is > polluted with initial changes, claiming that CRLF will converted to > LF. After committing that locally everything works fine. I assume that > Ode's code base contains different line-endings, sometimes even both > styles in one file. According to some mailinglist entries [1], there > are two solutions: > a) Do a large commit to git and then to svn, that unified the line endings > b) Do a cumbersome git filter-branch to rewrite the history and > unify line-endings for each file in each revision. > > I don't like either of them... Do you guys have made similar > experiences and/or suggestions? > I'm not sure how to handle that with git but regardless, I don't think we should have mixed carriage returns in our code. So I'd go for a). Btw, if you have a git repo with a full history for all branches, care to share? :) Instead of all of us hammering svn. Thanks, Matthieu > > Cheers, > Tammo > > [1] http://kerneltrap.org/mailarchive/git/2008/4/21/1530564 > > On Fri, May 9, 2008 at 4:21 PM, Matthieu Riou <[EMAIL PROTECTED]> > wrote: > > On Fri, May 9, 2008 at 5:42 AM, Tammo van Lessen <[EMAIL PROTECTED]> > > wrote: > > > >> Hi guys, > >> > >> have you been able to create a git repository having both trunk and 1.1 > >> branches linked together? > >> > > > > Nope. It's caused by the cutely named mod_dontdothat that blocks > successive > > queries to branches and root of a repository. The ASF infra uses it to > block > > SVN abusers but it has the annoying side effect of also blocking git-svn. > > Right now the svn infra is a bit overwhelmed but they're thinking of > > relaxing that in the next few months so people can at least use the > git-svn > > client. > > > > Cheers, > > Matthieu > > > > > >> > >> git svn clone -s fails for me (probably due to [1,2] and importing 2 > >> remote-svns doesn't make git understand that the 1.1 branch is a > descendant > >> of the trunk/master branch which makes cherry-picking a bit > cumbersome... > >> > >> Thanks, > >> Tammo > >> > > > > > > -- > Tammo van Lessen - [EMAIL PROTECTED] - http://www.taval.de >
