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

Re: No Changes but flagged as modified?

From: Jon Hardcastle <jd_hardcastle_at_yahoo.com>
Date: Tue, 3 Jun 2008 02:32:47 -0700 (PDT)

--- On Tue, 3/6/08, Simon Large <simon.tortoisesvn_at_googlemail.com> wrote:

> From: Simon Large <simon.tortoisesvn_at_googlemail.com>
> Subject: Re: No Changes but flagged as modified?
> To: users_at_tortoisesvn.tigris.org
> Date: Tuesday, 3 June, 2008, 9:31 AM
> 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
> > this).
>
> 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.
>
> Simon
>
> --

The files were definitely identical - as simon pointed out. I checked the md5. I also turned off all the options to 'ignore x y z' in Tortoise.

The version I am running is:

TortoiseSVN 1.4.5, Build 10425 - 32 Bit , 2007/08/26 11:14:13

Unfortunately necessity has meant I have had to commit the 'changes' so i don't have them any more in their so called differing state.. but i do note that it has added them as 'replacing' another file?

Thanks

-----------------------
N: Jon Hardcastle
E: Jon_at_eHardcastle.com
'The writing is on the wall...'
-----------------------

---------------------------------------------------------------------
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 11:32:58 CEST

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