11.07.2015 Views

Version Control with Subversion - Login

Version Control with Subversion - Login

Version Control with Subversion - Login

SHOW MORE
SHOW LESS

Create successful ePaper yourself

Turn your PDF publications into a flip-book with our unique Google optimized e-Paper software.

<strong>Subversion</strong> Complete ReferenceNamesvn diff — This displays the differences between two revisions or paths.Synopsisdiff [-c M | -r N[:M]] [TARGET[@REV]...]diff [-r N[:M]] --old=OLD-TGT[@OLDREV] [--new=NEW-TGT[@NEWREV]] [PATH...]diff OLD-URL[@OLDREV] NEW-URL[@NEWREV]Description• Display the differences between two paths. You can use svn diff in the following ways:• Use just svn diff to display local modifications in a working copy.• Display the changes made to TARGETs as they are seen in REV between two revisions.TARGETs may be all working copy paths or all URLs. If TARGETs are working copy paths,N defaults to BASE and M to the working copy; if TARGETs are URLs, N must be specifiedand M defaults to HEAD. The -c M option is equivalent to -r N:M where N = M-1. Using-c -M does the reverse: -r M:N where N = M-1.• Display the differences between OLD-TGT as it was seen in OLDREV and NEW-TGT as itwas seen in NEWREV. PATHs, if given, are relative to OLD-TGT and NEW-TGT and restrictthe output to differences for those paths. OLD-TGT and NEW-TGT may be working copypaths or URL[@REV]. NEW-TGT defaults to OLD-TGT if not specified. -r N makesOLDREV default to N; -r N:M makes OLDREV default to N and NEWREV default to M.svn diff OLD-URL[@OLDREV] NEW-URL[@NEWREV] is shorthand for svn diff --old=OLD-URL[@OLDREV] --new=NEW-URL[@NEWREV].svn diff -r N:M URL is shorthand for svn diff -r N:M --old=URL --new=URL.svn diff [-r N[:M]] URL1[@N] URL2[@M] is shorthand for svn diff [-rN[:M]] --old=URL1 --new=URL2.If TARGET is a URL, then revs N and M can be given either via the --revision option orby using the “@” notation as described earlier.If TARGET is a working copy path, the default behavior (when no --revision option isprovided) is to display the differences between the base and working copies of TARGET. Ifa --revision option is specified in this scenario, though, it means:--revision N:MThe server compares TARGET@N and TARGET@M.--revision NThe client compares TARGET@N against the working copy.If the alternate syntax is used, the server compares URL1 and URL2 at revisions N and M,respectively. If either N or M is omitted, a value of HEAD is assumed.By default, svn diff ignores the ancestry of files and merely compares the contents of thetwo files being compared. If you use --notice-ancestry, the ancestry of the paths in245

Hooray! Your file is uploaded and ready to be published.

Saved successfully!

Ooh no, something went wrong!