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

Re: Possible Bug: File marked as modified, but no changes when viewed through SVN merge

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2006-06-20 18:59:42 CEST

Stephen Goodman wrote:

> I use Macromedia Dreamweaver 8 (and previously MX 2004), and noticed
> somewhat strange behavior with tortoiseSVN. I have dreamweaver
> configured to connect to a remote server, and checkout a file for
> editing. This downloads the latest copy of the file off the server
> into my working copy, and writes a .LCK file into the directory.
> Provided my local working copy and the recently downloaded file are
> identical, I would think that when I run my next commit to the
> repository, the file would not be included, because the file has not
> changed, save for the local modification time metadata.
> However, tortoiseSVN is currently committing all files that were
> downloaded off the server since the last commit, even if the content
> of the file hasn't changed, (confirmed through inspection with
> tortoiseMerge). Is this a bug, or designed behavior to version OS
> metadata?

Check the settings of TortoiseMerge: do you ignore line endings? Or
whitespace changes? If yes, then of course TMerge won't show you a
difference because you specifically *ignored* those changes.

There's one other thing that TMerge didn't catch (in 1.3.x releases): if
the file had an EOL removed or added on the last line.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Jun 20 18:59:56 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.