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

Re: [TSVN] Files appear as modified in commit dialog that are identical to trunk.

From: Mark Phippard <MarkP_at_softlanding.com>
Date: 2005-07-12 16:05:57 CEST

Nick Gilbert <nick@x-rm.com> wrote on 07/12/2005 10:01:06 AM:

> Why is it that quite often, files are shown in the commit dialog that
> are identical to the ones in the trunk? (or whichever branch you're
> working copy is for).
>
> Ie, if I change a file, and then change it back, it needs to be
> committed as TortoiseSVN thinks it's different to the repo copy of the
> file (it isn't). If you compare the files using TortoiseMerge, they seem
> identical.
>
> Is this a bug, or does TortoiseSVN have to commit every file that's been
> touched sinced you checked it out (I'm sure it didn't use to).
>
> The only other thing I can think of is that there's a tiny whitespace
> difference for some reason, and maybe TortoiseMerge ignores whitespace
> differences?

If there were not differences, then Subversion would not show it as
changed. You probably created a whitespace/line-ending change and
TortoiseMerge is set to ignore those differences. Try turning off that
setting in TortoiseMerge.

In general, do not edit a file back to the way it was. Instead use the
Revert option. This will do this for you automatically. Also, if you
edit the file then the file's timestamp will change. This means that
Subversion will have to do a byte by byte compare of the whole file to
determine that it is not changed. Revert will fix this too.

Mark

_____________________________________________________________________________
Scanned for SoftLanding Systems, Inc. by IBM Email Security Management Services powered by MessageLabs.
_____________________________________________________________________________

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Jul 12 16:06:27 2005

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