List Info

Thread: New - svn diff doesn't ignore all eols




New - svn diff doesn't ignore all eols
user name
2007-09-11 13:28:37
http://subversion.tigris.org/issues/show_bug.cgi?id=2920

                 Issue #|2920
                 Summary|svn diff doesn't ignore all eols
               Component|subversion
                 Version|trunk
                Platform|All
                     URL|http://http://subversion.tigris.org/servlets/ReadMsg?l

                        |ist=dev&msgNo=129822
              OS/Version|All
                  Status|NEW
       Status whiteboard|
                Keywords|
              Resolution|
              Issue type|DEFECT
                Priority|P2
            Subcomponent|libsvn_diff
             Assigned to|issuessubversion
             Reported by|steveking






------- Additional comments from stevekingtigris.org Tue Sep 11 11:28:37 -0700 2007 -------
As reported on the mailing list here:
http://subversion.tigris.org/servlets/Rea
dMsg?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.

------------------------------------------------------------
---------
To unsubscribe, e-mail: issues-unsubscribesubversion.tigris.org
For additional commands, e-mail: issues-helpsubversion.tigris.org


svn diff doesn't ignore all eols
user name
2007-09-11 13:49:19
http://subversion.tigris.org/issues/show_bug.cgi?id=2920




User steveking changed the following:

                What    ld value 
               |New value
============================================================
====================
        Target milestone|---                      
|1.5-consider
------------------------------------------------------------
--------------------




------- Additional comments from stevekingtigris.org Tue Sep 11 11:49:19 -0700 2007 -------
putting this in 1.5-consider.
I hope I'm not offending someone by doing this.

------------------------------------------------------------
---------
To unsubscribe, e-mail: issues-unsubscribesubversion.tigris.org
For additional commands, e-mail: issues-helpsubversion.tigris.org


svn diff doesn't ignore all eols
user name
2007-09-13 15:15:43
http://subversion.tigris.org/issues/show_bug.cgi?id=2920







------- Additional comments from lgotigris.org Thu Sep 13
13:15:43 -0700 2007 -------
Added regression test in r26583.

Note that on Windows, it only fails when changing CRLF to
LF, changing from CRLF
to CR works correctly.


------------------------------------------------------------
---------
To unsubscribe, e-mail: issues-unsubscribesubversion.tigris.org
For additional commands, e-mail: issues-helpsubversion.tigris.org


[1-3]

about | contact  Other archives ( Real Estate discussion Medical topics )