Subversion Tip – What Has Changed

Have you ever wanted to know what others on your team have changed BEFORE you get the latest changes? Well, you can.

From Windows Explorer, use TortoiseSVN’s context menu to “show log”. From the log messages report, you can right-click on the most recent revision and “Compare with Working Copy.”

You’ll get a window like the below with the files that have changed on the left and the differences on the right. I’m using TortoiseMerge for my diff tool so you might see something a little different. I’ve also switched the left and right views so my working copy is on the left and the latest revision version is on the right.

Updating a Project and Editing Conflicts with TortoiseSVN

In TortoiseSVN, when getting the latest of multiple files, you may that there were conflicts in the merge process. Before you close this window, just scroll up and right click on the file with the conflict.

Select “Edit conflicts” and use the Merge tool to resolve them.

Compare 2 Local Files with TortoiseSVN

You can compare 2 different files using SVN Diff! Just go into Windows Explorer, select 2 files (ctrl click) and right click on one of them. You’ll get a context menu like this:

Just click SVN Diff (or you might see TortoiseSVN > Diff instead).

You’ll get a nice side-by-side comparison of the differences in the two files.

(P.S. This was done using Tortoise 1.6.6)