Uploaded image for project: 'Subversion'
  1. Subversion
  2. SVN-2920

svn diff doesn't ignore all eols

    XMLWordPrintableJSON

Details

    • Bug
    • Status: Closed
    • Critical
    • Resolution: Fixed
    • trunk
    • 1.5.0
    • libsvn_diff
    • None

    Description

      As reported on the mailing list here:
      http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=129822
      (no answer to that mail though, filing an issue so it won't get lost)
      
      when using 'svn diff' on a modified file (which doesn't have the 
      svn:eol-style property set) and specifying '-x--ignore-eol-style', the 
      eol is only ignored for non-empty lines. Empty lines still show up as 
      different.
      
      Steps to reproduce:
      
      1) create a text file, containing several lines.
      2) insert an empty line in between every text line in that file
      3) save the file
      4) 'svn add file'
      4.5) make sure that the svn:eol-style property is *not* set on that file 
      (e.g., due to the configured autoprops).
      5) 'svn ci -m ""'
      6) open the text file in an editor, change all line endings (e.g., from CRLF to LF).
      7) save the file again with the changed eols
      8) 'svn diff -x--ignore-eol-style file'
      
      this will output all empty lines as different, but not the non-empty lines.
      
      I expected the empty lines to be ignored too.
      
      (using svn.exe 1.5.0 dev build, compiled Sep 4 2007, built from r26443)
      
      
      
      Since the diff library is used in TortoiseMerge, this is a serious problem which
      I'd like to get solved for 1.5. If that's not possible, I'd have to implement a
      workaround in TortoiseMerge, but that will get ugly.
      

      http://http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=129822

      Attachments

        Activity

          People

            Unassigned Unassigned
            steveking Stefan Küng
            Votes:
            0 Vote for this issue
            Watchers:
            0 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved: