Re: inconsistent new lines - repair by modifying dump?

Jared Silva wrote:

> Lübbe, I think you are misunderstanding the issue.
>
> TortoiseMerge should not depend on "svn:eol-style" being set.

It doesn't.

> 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:
> http://svn.haxx.se/tsvnusers/archive-2007-01/0121.shtml

What do you mean with 'no longer'? It never has handled mixed eol-styles
at all. If it worked for you with previous versions, then only because
there was a bug where TortoiseMerge would show a slightly *wrong* diff.

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

Or you can use a nightly build from trunk:
http://issues.tortoisesvn.net/?do=details&task_id=336
That issue also implemented the handling of mixed newline styles.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org