svn diff when files are marked with “history scheduled with commit”

Question

I have changes on a branch that I have merged to trunk in my working directory. Svn stat shows the correct list of changed files. However, the \"svn stat\" output includes a \

Answer 1

The + character in the output of svn status indicates that the file has "History scheduled with commit". This means that the file is not actually a new file, but actually a direct descendant of some other file in the Subversion repository.

This means that there should be no output in svn diff, since the file has not actually changed. If you were to make some local modifications to the file, they would appear in the svn diff output.

Answer 2

When version 1.7 is released, svn diff will have a --show-copies-as-adds switch for that purpose. That's a good indication that versions through 1.6 don't have that ability.

Answer 3

if you "svn mv fileA fileB". there will be + sign near fileB. I think the + sign means the actual file content has not been changed, so it does not show up in svn diff. In this case, it is just the file name has changed.