tags:

views:

30

answers:

2

I have a working copy of a repository on my machine, and I know that it has been updated on the server. I would like to know how to get the difference between the new version and the version in my working copy by using svn command line arguments.

Is there a way for me to do this?

A: 

Go to working dir and type

svn diff

More options you can find here: svn diff

Pmod
+1  A: 

The working copy is revision BASE. The latest copy from the repository is revision HEAD. This will compare your working copy against the HEAD revision:

svn diff -r HEAD <file>

Actually that'll spit the changes out in reverse, i.e. it tells you how to go from HEAD to BASE. So technically you want:

svn diff -r BASE:HEAD <file>

Can you spare the keyboard strokes? Only you and your deity know that answer.

John Kugelman
+1 for wit. selected for correctness
mvid
The working copy file can be different from base (when you have local modifications to the file). You should realize that it diffs the file without the local modifications with the server.
Sander Rijken