Unix in a Nutshell, 4th Edition

Name

diff

Synopsis

svn 
                         
 diff [-r N[:M]] [--old old-tgt][--new new-tgt] [path ...]
svn diff -r N:M URLsvn diff [-r N[:M]] URL1[@N] URL2[@M]

Display the differences between two paths. The three different ways you can use svn diff are:

svn diff [-rN[:M]] [--oldold-tgt] [--newnew-tgt] [path ...]

Display the differences between old-tgt and new-tgt. If paths are given, they are treated as relative to old-tgt and new-tgt and the output is restricted to differences in only those paths. old-tgt and new-tgt may be working copy paths or URL[@ rev]. old-tgt defaults to the current working directory and new-tgt defaults to old-tgt. N defaults to BASE or, if old-tgt is a URL, to HEAD. M defaults to the current working version or, if new-tgt is a URL, to HEAD. svn diff -r N sets the revision of old-tgt to N, whereas svn diff -r N : M also sets the revision of new-tgt to M.

svn diff -r N : M URL

A shorthand for svn diff -r N : M --old= URL --new= URL.

svn diff [-r N [: M ]] URL1 [@ N ] URL2 [@ M ]

A shorthand for svn diff [-r N[: M]] --old= URL1 --new= URL2.

If target is a URL, then revisions N and M can be given either via the --revision option or by using “@” notation as described earlier.

If target is a working copy path, then the --revision option means:

--revision N : M

The server compares target @ N and target @ M.

--revision N

The client compares target @ N against the working copy.

No --revision option

The client compares the base and working copies of target.

If the alternate syntax is used, the ...