views:

133

answers:

1

Two questions:

How to make the TortoiseSvn diff tool ignore the EOL style?

How to fix mixed EOL style files during the conversion from PVCS to SVN?

I've just imported a PVCS archive to Subversion using the excellent free Polarion conversion tool. Everything looks fine, there is just one annoying thing that I'd like to fix.

Some of the cpp files in the original PVCS archive have mixed EOL styles (due to the PVCS merge tool). These files (and all their revisions) are now copied into the Subversion archive using the autoprops setting "svn:eol-style=native".

When I use the TortoiseSvn diff to see a difference between two versions I get the error message "Inconsistent line ending style".

The whole idea of converting 10 years of revision history from PVCS to Subversion is to make it easy for the programmers to see what changes were made in the past - and if you need to clean-up an old file manually before a diff is possible, it's not going to work.

+1  A: 
Michael Hackner
Thanks. Based on the two responses I got so far I conclude that we need to substitute the built-in compare tool of Tortoise with a more flexible tool like WinMerge or BeyondCompare.
Jens