Comparing/finding out changed files across branches in Subversion

Question

Hi all:

I'm currently working off the version of my project from the head from Subversion. I have a branch which is an older version of the project. I now need to find out which files have changed and what are their changes.

I was wondering are there any ways to find out? Are there special tools required to do so, or just regular commands? I'm interested in finding out the steps and command on how to do it.

I have Subversion integrated into Visual Studiou 2008.

Thanks.

Answer 1

See the SVN manual for the svn diff command. The third usage should probably achieve what you want:

svn diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]

Answer 2

You can use the merge wizard to figure out what can possibly be merged to the branch if that helps.

• Right click the solution
• Subversion -> Merge
• Choose "Merge a range of revisions"
• Choose "Select revisions on the next page" and choose the other branch (not the one you're currently working on)

The next page that comes up is meant to be used what revisions you want to merge. It lists only the revisions that can be merged (that haven't been merged yet). You can look through the revisions, and the changes files in each revision. If you right click or double click on a file, you can take a look at the changes in the file/revision.