The files may have different EOL characters. This is a problem I am
currently having (and was going to post a question/request about
this).
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?
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"?
On Jun 2, 7:48 am, "Simon Large" <simon.tortoise..._at_googlemail.com>
wrote:
> 2008/6/2 Jon Hardcastle <jd_hardcas..._at_yahoo.com>:
>
> > Hi,
>
> > I have just done a merge and a file that i wouldn't have expected to have changed appears as modified? the interesting thing is that the right click->Diff shows no changes either? Even if i use WinMerge or an MD5 the files are identical.
>
> > Does the modification property include date's and times?
>
> > Can anyone shed some light on this?
>
> You don't say which version you are using.
>
> If file content is the same the file is considered to be unmodified,
> even if the timestamps differ. Was there a change to the file's svn
> properties? Try the check for modifications dialog.
>
> Simon
>
> --
> : ___
> : oo // \\ "De Chelonian Mobile"
> : (_,\/ \_/ \ TortoiseSVN
> : \ \_/_\_/> The coolest Interface to (Sub)Version Control
> : /_/ \_\http://tortoisesvn.net
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscr..._at_tortoisesvn.tigris.org
> For additional commands, e-mail: users-h..._at_tortoisesvn.tigris.org
---------------------------------------------------------------------
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-02 19:56:38 CEST