Jeroen Ruigrok van der Werven wrote: > -On [20071211 15:04], Christian Boos ([EMAIL PROTECTED]) wrote: > >> Well, it's most probably because svnmerge didn't cope well with that >> prop change. >> > > r6289 introduced three updated files that suddenly contained ^M, namely: > TracPermissions, TracGuide and one other. > > This is causing problems. I can work around it though, but it might be the > result of something else that we might want to avoid in the future? >
Yes, that was before the svn:eol-style switch which was done precisely to avoid such issues in the future, as Subversion won't let you commit a file with mixed line ending style once the property is set. So we're safe ... at least for those files. I guess we could do the same one day for the remaining stuff (htdocs files and templates, I think). Even though I dislike the "native" ending style, I got so much used to the workarounds that I feel like giving up trying to convince people to standardize on LF... -- Christian --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Trac Development" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/trac-dev?hl=en -~----------~----~----~----~------~----~------~--~---
