Subversion: How to compare differences between incoming changes?

Solution 1:

I believe what you need is:

svn diff -rBASE:HEAD

Solution 2:

FYI svn diff gives a diff based on the unmodified file stored in the .svn directory, not based on the live repo version.

You can run svn update to get subversion to attempt an update (and possibly merge) and then do an svn diff, but that's not as clean as I guess you want.

Finally svn diff does support diffing just on the repo. Example:

svn diff svn://svnserver/repo/localChanges.html -r REV_NO

Which defaults to comparing HEAD with the passed revision.

Solution 3:

With tortoisesvn (if you use windows)

• Invoke the log screen

• Select head revision

• Right click on localAndIncoming.html

• Choose Compare with working copy