Free Software Server Environment : SubVersionDiff

HomePage :: Categories :: PageIndex :: RecentChanges
Search this site: FSSE.INFO is produced by "osde8info" :

Subversion Differences


diff
Svn difference between the BASE revision of the file that you checked out and your current local file
$ svn diff myfile.php

If svn "status --show-updates" is showing file has changed but you cant see any local differences you may need to force svn diff to compare your local copy with the current HEAD revision in svn repo
$ svn diff -rHEAD myfile.php


diff ignoring blank lines and white space
If you want svn diff to use a different external diff command so you can ignore blank lines, whitespace etc then you'll need tio use svn diff --diff-cmd and --extensions switches
$ svn diff --diff-cmd diff --extensions "--ignore-blank-lines --ignore-all-space" myfile.php

since this is a lot to type you probably want to create some aliases
$ alias svndiff='svn diff --diff-cmd diff --extensions "--ignore-blank-lines --ignore-all-space"'
$ alias svndiffsbs='svn diff --diff-cmd diff --extensions "--ignore-blank-lines --ignore-all-space --side-by-side --suppress-common-lines"'



REFERRERS
SubVersionDailyUsage

There are no comments on this page. [Add comment]

Valid XHTML 1.0 Transitional :: Valid CSS :: Powered by WikkaWiki
Page was generated in 0.0176 seconds