On Fri, 2016-09-02 at 12:39 -0400, Andrew Stitcher wrote: > On Fri, 2016-09-02 at 12:11 -0400, Matt Broadstone wrote: > > > > ... > > > > > > Can you explain exactly what the problem you are seeing actually > > > is? > > > > > > > > Sure. > > > > The problem comes down to debian's sanity checks to ensure that > > files > > have > > not been modified locally before building and packaging the > > resultant > > deb > > file. > > ... > > Thanks for the explanation. I think the issue may be that changing > the > repository has changed the line endings. Svn line ending handling and > git line ending handling are different. > > > > > > > Generally speaking though, I think this is a problem you'll want to > > solve > > anyway given that you have mixed OS developers accessing the code > > on > > a > > somewhat regular basis. > > Well, I did put some effort into solving this issue many years ago > for > Svn and things quieted down! I think there may actually be an > attributes file for svn which does this stuff. > > For git typically you don't want to set up any attributes for this at > all and just let git check out exactly what ever is checked in. I > suspect this is the issue - svn was changing the line endings to suit > the platform but git doesn't. > > As far as I can tell, Visual Studio (and all competant Windows > editors > - just don't use notepad!) cope fine with \n line endings nowadays so > I'd be in favor of fixing the line endings in all text files to be \n > rather than adding a whole slew of attributes. > > I'd rather enforce this on commits, than change what's checked out > with > attributes. >
+1 although git seems to have a more flexible story than SVN. It can automatically adjust line endings between your local clone repo and your workspace, not just on push or pull. So a .gitattributes file could enforce normalization at everybody's clone, not just on push. People who like CRLF could set up local attributes to get them added back in their own workspace, even though they never appear in any repo. Haven't played with it before so: Warning! May contain nonsense. Prepared in a facility that uses nonsense. --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
