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

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

From: SteveKing <steveking_at_gmx.ch>
Date: 2003-07-12 21:26:04 CEST

----- Original Message -----
From: "Eric Hanchrow" <offby1@blarg.net>
> * 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:

Did you use the command line client for the diff? If not: please
describe the steps you took to do the diff with TSVN.

> * 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.)

TSVN just starts WinDiff (or any other diff program you chose
in the settings) with the working copy file and the text base file.
If you do the command "compare with working copy" in the
log dialog then TSVN first does a 'svn cat' to get the file from
the revision you selected and then starts WinDiff.

> * Perhaps subversion should make the text base have native line
> endings in the first place

Do you know the svn:eol-style property?


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:29:50 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.