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

Philip Martin <philip@codematters.co.uk> writes:

> "SteveKing" <steveking@gmx.ch> writes:
>
> > TSVN just starts WinDiff (or any other diff program you chose
> > in the settings) with the working copy file and the text base file.
>
> That's not going to work, the text base is a copy of the file in the
> repository, it doesn't have keywords expanded nor does it have eols
> converted.

Yes, this is definitely a bug in TSVN. svn_client_diff() goes through
great pains to compare the working-file with a *copy* of the text-base
that is correctly keyword-expanded and/or eol-translated. That
explains why Eric was getting broken diffs, even though svn:eol-style
was set to 'native'.

If TSVN were to use svn_client_diff(), it would no longer need to
depend on an external diff tool at all -- Subversion produces diffs
internally now. Or, if TSVN (or the user) still wants to run WinDiff,
just specify it in the ctx->config, and svn_client_diff will use it.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Jul 13 14:43:39 2003