Details

    • Type: Improvement Improvement
    • Status: Resolved
    • Priority: Minor Minor
    • Resolution: Fixed
    • Affects Version/s: 1.1.4
    • Fix Version/s: 1.2.0, 1.1.5, 2.0.0
    • Component/s: general
    • Labels:
      None

      Description

      Line endings are inconsistent on the java source files, and I suspect there are inconsistent line endings on other files as well in the pluto project. It's annoying, and also impedes patch application.

      I plan to update the line endings on text files ending with the following extensions, and then setting the svn property 'svn:eol-style' to "native" for those files.

      apt
      css
      dtd
      fml
      html
      inc
      js
      jsp
      properties
      tld
      txt
      xml
      xsd

        Activity

        Hide
        Elliot Metsger added a comment -

        Used this script, first using file to make sure the extensions weren't lying.

        for ext in apt css dtd fml html inc js jsp properties tld txt xml xsd java ;
        do
        for f in `find . -name "*.$ext"` ; do
        cp $f foo ; perl -np -e "s:\r\n:\n:g" < foo > $f ;
        svn ps svn:eol-style native $f
        done
        done

        Show
        Elliot Metsger added a comment - Used this script, first using file to make sure the extensions weren't lying. for ext in apt css dtd fml html inc js jsp properties tld txt xml xsd java ; do for f in `find . -name "*.$ext"` ; do cp $f foo ; perl -np -e "s:\r\n:\n:g" < foo > $f ; svn ps svn:eol-style native $f done done
        Hide
        Elliot Metsger added a comment -

        committed on 1.1.x branch 607448

        Show
        Elliot Metsger added a comment - committed on 1.1.x branch 607448
        Hide
        Elliot Metsger added a comment -

        committed on 1.1-286-trunk-merge branch 607449

        Show
        Elliot Metsger added a comment - committed on 1.1-286-trunk-merge branch 607449
        Hide
        Elliot Metsger added a comment -

        committed to trunk 607450

        Show
        Elliot Metsger added a comment - committed to trunk 607450
        Hide
        Craig Doremus added a comment -

        Thanks for doing this Elliot.

        Is there any thing that needs to be done to new files added to SVN to make sure they conform to this issue? If so, is this done in the file or the SVN commit command?

        Show
        Craig Doremus added a comment - Thanks for doing this Elliot. Is there any thing that needs to be done to new files added to SVN to make sure they conform to this issue? If so, is this done in the file or the SVN commit command?
        Hide
        Elliot Metsger added a comment -

        Yes, you need to enable auto-props in your subversion config file and make sure you have specified the filename patterns and svn:eol-style property. It also helps to specify the mime type of the file.

        Files that you 'svn add' will get these properties set on them automatically if the file matches the pattern.

        E.g. in ~/.subversion/config

        ....

        enable-auto-props = yes

        [auto-props]
        *.java = svn:mime-type=text/plain;svn:eol-style=native;svn:keywords=Id
        *.properties = svn:mime-type=text/plain;svn:eol-style=native
        *.xml = svn:mime-type=text/xml;svn:eol-style=native

        ...

        Show
        Elliot Metsger added a comment - Yes, you need to enable auto-props in your subversion config file and make sure you have specified the filename patterns and svn:eol-style property. It also helps to specify the mime type of the file. Files that you 'svn add' will get these properties set on them automatically if the file matches the pattern. E.g. in ~/.subversion/config .... enable-auto-props = yes [auto-props] *.java = svn:mime-type=text/plain;svn:eol-style=native;svn:keywords=Id *.properties = svn:mime-type=text/plain;svn:eol-style=native *.xml = svn:mime-type=text/xml;svn:eol-style=native ...

          People

          • Assignee:
            Elliot Metsger
            Reporter:
            Elliot Metsger
          • Votes:
            0 Vote for this issue
            Watchers:
            0 Start watching this issue

            Dates

            • Created:
              Updated:
              Resolved:

              Development