Re: [PATCH] git-svn now work with crlf convertion enabled.
- From
- Eric Wong <normalperson@yhbt.net>
- Date
- Aug 4, 2008, 00:48 UTC
- Message-ID
- <20080804004826.GB13019@untitled>
- In-Reply-To
- <200807311243.35219.litvinov2004@gmail.com>
Alexander Litvinov <litvinov2004@gmail.com> wrote:
Show 5 quoted lines
> Make git-svn works with crlf (or any other) file content convertion enabled. > > When we modify file content SVN cant apply its delta to it. To fix this > situation I take full file content from SVN as next revision. This is > dump and slow but it works.
> + my $ctx = SVN::Client->new(); > + $ctx->cat($fh, $url, $rev); > }
I know you've already (at least for now) pulled this patch but I won't accept anything that opens a second connection to the server.
I've seen this in some svn:// servers intermittently, but I've seen git-svn get its connection terminated whenever it opens a second connection (it happens with parent-following). git-svn used to do this more frequently, but most of those cases got fixed (but one remains with parent-following).
Additionally, git-svnimport and older versions of git-svn used the equivalent of $ctx->cat without deltas from the SVN::Ra object, so you should be able todo something functionally equivalent w/o opening a new socket.
As far as crlf issues with git-svn go, I'm blissfully ignorant of the complexities behind what git (or svn for that matter) does with crlf conversions[1].
I'll be alright with any changes to git-svn that don't modify existing behavior for crlf-ignorant users such as myself. I'll trust Junio and other folks on the list to know and do what makes the most sense here.
[1] I would have much rather preferred git didn't implement or care
about crlf filters at all, but maybe I'm just in a small minority.-- Eric Wong