2008/6/2 Jeff S. <switzer.jeff_at_gmail.com>:
> The files may have different EOL characters. This is a problem I am
> currently having (and was going to post a question/request about
No. The OP said the files had the same MD5SUM, so the line endings
must be identical in that case.
> If you have a merge tool that allows you to check/uncheck a value
> similar to "Ignore differences in line ending characters (CR and LF)",
> do the files appear to be different?
Yes, of course. The files are shown as different if there is any
difference at all. How could the Subversion know what settings you are
using in your external merge tool? It is possible that if you use
svn:eol-style the line endings will all be silently corrected when you
commit. Not sure about that.
> I use the function "Compare Revisions" in TortoiseSVN to create my
> deployment packages. I have recently noticed, that TortoiseSVN is
> detecting differences in files that I believe to be the same. When I
> use Araxis Merge (my tool of choice), to compare the files, they
> appear to be similar (unless I uncheck the "Ignore differences in line
> ending characters (CR and LF)" function), in which I see the EOL
> characters actually differ.
> My question:
> Is there a way to get TortoiseSVN to ignore EOL differences when using
> "Compare Revisions"?
I don't believe that is possible. The diff preview function that we
use only generates a list of files that have changed, which is a quick
operation. In order to find out whether the change is interesting to
you would require downloading the 'before' and 'after' copies of every
changed file and running the diff with your preferred options to find
out what the differences are. If the change includes 1000 files and
you are not using a LAN connection that could take a *very* long time
just to return the list.
: oo // \\ "De Chelonian Mobile"
: (_,\/ \_/ \ TortoiseSVN
: \ \_/_\_/> The coolest Interface to (Sub)Version Control
: /_/ \_\ http://tortoisesvn.net
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-06-03 10:31:41 CEST