|
Boost : |
Subject: Re: [boost] Line endings fixes
From: Niall Douglas (ndouglas_at_[hidden])
Date: 2013-08-09 10:39:20
> > There is something real weird going on, as supposedly git should
> > rationalize
> > mismatched EOLs during a svn commit replay irrespective of mismatch in the
> > svn content.
>
> If by âsvn commit replayâ you mean what Boost2Git is doing, then no,
> thereâs no reason to think that should happen. Weâre using
> git-fast-import, which just eats the raw bytes you send it and doesnât have
> an opinion about whether theyâre text or not.
That is extremely useful to know, and indeed I can see where the EOL problem might have come from now.
> Also, let me be very clear, just in case thereâs some misunderstanding
> about this: it is not Boost2Gitâs job to fix bad SVN commits in the past.
> If something like that needs to be fixed before the transition, it should
> be fixed by making new commits to SVN, which means existing history stays
> as it is. Another option is to make fixes in Git immediately after the
> transition (which again, doesnât change history). That means the only
> things we can alter that change the way history appears in Git are
> .gitattributes, repositories.txt, etc., and non-Boost-specific logic in the
> Boost2Git source codeâat least, not without very extensive justification.
If it is the original SVN which is in error, it could be that SVN fixes it up on checkout and hence we've never noticed it before. That implies the need for a tool which can grok the SVN repo directly for mismatched EOLs.
Niall
--- Opinions expressed here are my own and do not necessarily represent those of BlackBerry Inc.
Boost list run by bdawes at acm.org, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk