I had to figure out if any of the incoming Source Code Control changes from the upstream SVN repository was going to clobber any of my local changes. Any time I have to google and figure out the best solution I think it is a good time to share.
This is a particularly clever alternate use of the merge command, courtesy of http://translocator.ws/2005/10/12/svn-update-dry-run
$> svn merge --dry-run -r BASE:HEAD . --- Merging r111893 through r113808 into '.': A assets/web.config U assets/.htaccess --- Merging r111893 through r113808 into 'mysite': C mysite --- Merging r111893 through r113808 into '.': C .htaccess --- Merging r111893 through r113808 into 'install.php': C install.php Summary of conflicts: Text conflicts: 1 Tree conflicts: 2
Simple and clean! Now I had to do this again under another repo that is under GIT supervision. Again, not straight way to cut this but you can fetch the remote changes and view the log for the same effect:
$> git fetch http://path.to/repo.git/ $> git log -p HEAD...origin
Credit for the bonus is to Stack Overflow: http://stackoverflow.com/questions/180272/how-to-preview-git-pull-without-doing-fetch