Hi Alberto, Well, sorry for not being enough explicit: the problem arises when I update changes I submitted. I very often have conflicts, but they are only relative to line endings. Saying otherwise: I got a specific line ending on my computer, and what I get when re-getting my changes Robert added to SVN is using another lind ending.
Sukender PVLE - Lightweight cross-platform game engine - http://pvle.sourceforge.net/ ----- "Alberto Luaces" <[email protected]> a écrit : > Hi Sukender, > > Sukender writes: > > > Hi Alberto, > > > > This is eactly what I mean: under Windows, you got CRLF endings. And > when submitting to osg-submissions, I generally have to manually > convert line endings, which is annoying. > > > > Are you sure about that? I made a test and checked in files with CRLF > endings in a local Linux repository with the text file property set as > `native' and the eol marks where converted automatically, so you > shouldn't have to do that task. > > Robert can clarify, but I don't remember him asking to convert the > line > endings of the submissions. > > > > > Sukender > > PVLE - Lightweight cross-platform game engine - > http://pvle.sourceforge.net/ > > > > ----- "Alberto Luaces" a écrit : > > > >> Hi Sukender, > >> > >> Sukender writes: > >> > >> > Hi Robert, hi all, > >> > > >> > Maybe a silly question, but... why doesn't the svn:eol is set to > LF > >> everywhere, as submissions are always converted to unix line > endings? > >> > >> svn:eol-style is set to `native' for all files, so the line > >> terminator > >> you get depends on the platform where you perform the checkout. > >> > >> -- > >> Alberto > > -- > Alberto > > _______________________________________________ > osg-submissions mailing list > [email protected] > http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org _______________________________________________ osg-submissions mailing list [email protected] http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
