[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

more eol confusion: "diff" shows all lines differing :(

From: Eric Hanchrow <offby1_at_blarg.net>
Date: 2003-07-12 21:06:14 CEST

I suspect this issue has been addressed before, but after browsing the
archives for half an hour, I found nothing that was quite pertinent.

Anyway, using 0.24.2, I did these things:

* On a Unix box,

    svnadmin create /tmp/svn
    svn co file:///tmp/svn wc
    cd wc
    echo hello > hello
    svn add hello
    svn propset svn:eol-style native hello
    svn -m '' ci

* On a Windows box, I used a Windows client (TortoiseSVN 0.12.1) to
  check out a copy of that repository. Then I edited the working copy
  with Notepad, and added one line, and then did a "diff". I expected
  to see just the one new line, but instead, I saw all the lines
  differing. I'm not even sure there's a bug here, but it's
  inconvenient. I can think of a few alternatives:

* Perhaps TortoiseSVN shouldn't blindly compare the working copy
  against the text base, but should instead make a temp file
  containing the text base translated to native, and use WinDiff to
  compare that temp file against the working copy. (Actually I don't
  know if TortoiseSVN is doing the comparison itself, or if instead
  it's asking a subversion client function to do the comparison.)
* Perhaps subversion should make the text base have native line
  endings in the first place

* Perhaps I should quit whining and get a decent "diff" program

Just to spell it out:
  At a Cygwin bash prompt (mounted binmode):

        $ od -c hello
        0000000 h e l l o \r \n

  This is what I expected; it shows that the Windows client properly
  put a carriage-return at the end of the line. But now

        $ od -c .svn/text-base/hello.svn-base
        0000000 h e l l o \n

Can anyone suggest a comfortable way to view these kinds of differences?

Wasting programmer time is the true inefficiency, not wasting machine time.
        -- Paul Graham
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Jul 12 21:07:14 2003

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.