Monday, February 23, 2015

SVN diff

The difference between working copy and HEAD; the changes which would need to be made to what is now in the repository (HEAD), to produce your working copy:
svn diff -r HEAD --old=
Of possible interest, the difference between BASE and HEAD; changes that have been checked into the repository since you last updated working copy:
svn diff -r BASE:HEAD 
And of course the difference between BASE and working copy; the changes you have made since you last updated working copy:
svn diff 

There are three versions being discussed: BASE, working copy, and HEAD.
  • BASE: as last checked out / updated. What working copy would revert to after using svn revert
  • working copy: local modifications to which has been checked out / updated as recently as BASE
  • HEAD: latest modifications in repository. Equivalent to BASE iff no changes have been committed since was checked out / updated as working copy.
 Src: http://stackoverflow.com/questions/3773345/check-diff-against-file-on-the-server

No comments:

Post a Comment