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

Re: inconsistent new lines - repair by modifying dump?

From: Jared Silva <jayrod_at_gmail.com>
Date: 2007-04-30 20:28:50 CEST

Lübbe Onken wrote:
> I reckon that the problem is not with TortoiseMerge either, but with
> inconsistent or no use of the svn:eol-style property combined with
> simultaneously using editors that use different eol-styles.


> I recommend that you set svn:eol-style to native on all your text source
> files first, commit and update your WC to make sure that all files are
> written with CRLF on a windows platform.

Lübbe, I think you are misunderstanding the issue.

TortoiseMerge should not depend on "svn:eol-style" being set.
Furthermore, setting "svn:eol-style" only prevents the problem from
occurring in the future. It does not prevent the problem from
occurring in the past (TortoiseMerge diff of revisions before
"svn:eol-style" being set).

IMO, it is a bug that TortoiseMerge no longer handles mixed line
ending files when "svn:eol-style" is not set. See my previous email:

At first, I switched between the 1.3.5 and the latest version of
TortoiseMerge to work around this problem. That got annoying, so now
I use WinMerge exclusively to view differences.

Here is an example:
1.) svn add a text file with mixed line endings (do NOT set "svn:eol-style")
2.) svn diff and TortoiseMerge diff work OK
3.) svn ci the text file
4.) modify the text file
5.) svn diff works OK but TortoiseMerge diff does not work OK

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Apr 30 20:29:05 2007

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