Revision [729]

Last edited on 2008-08-22 10:17:50 by FsseInfo
Additions:
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
Deletions:
If svn status -u 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


Revision [725]

Edited on 2008-08-21 12:32:36 by FsseInfo
Additions:
===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 -u 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
Deletions:
===Subversion Diff===
Svn difference between your local version and the BASE revision in the subversion repository
$ svn diff file.txt
use diff if you want to ignore blank lines, whitespace or use other diff extensions / options
Note that by default svn diff compares your local copy with its BASE revision in your svn repo so if %%svn status -u%%
is showing file has changed but you cant see any local differences you need to force svn diff to compare your local copy with the HEAD revision in svn repo
$ svn diff -rHEAD myfile


Revision [724]

Edited on 2008-08-21 12:22:33 by FsseInfo
Additions:
Svn difference between your local version and the BASE revision in the subversion repository
$ svn diff file.txt
use diff if you want to ignore blank lines, whitespace or use other diff extensions / options
$ 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"'
Note that by default svn diff compares your local copy with its BASE revision in your svn repo so if %%svn status -u%%
is showing file has changed but you cant see any local differences you need to force svn diff to compare your local copy with the HEAD revision in svn repo
----
REFERRERS
{{backlinks}}
Deletions:
By default svn diff compares your local copy with its BASE revision in your svn repo
$ svn diff myfile
so if %%svn status -u%%
is showing file has changed but you cant see any differences you need to force svn diff to compare your local copy with the HEAD revision in svn repo


Revision [722]

The oldest known version of this page was created on 2008-08-21 12:16:04 by FsseInfo
Valid XHTML :: Valid CSS: :: Powered by WikkaWiki