A few svn commands help your daily work

1. See who has the last 10 commits.

svn log -l 10

2. Compare difference between commits.

svn diff . -r 5647:5648

If you setup to use FileMerge to see the different, FileMerge will open. See my previous post about how to setup.

How to open filemerge automatically from svn merge?

The built-in svn on mac (I am using Mac OS X 10.6.6) is hard to do merges.  Then I found this post. 

http://www.defraine.net/~brunod/fmdiff/

Here is what I did:
1)  get Bruno's code from svn.
mac-xdu:svn-fmdiff xdu$ svn checkout http://soft.vub.ac.be/svn-gen/bdefrain/fmscripts


2) build and install it.

mac-xdu:svn-fmdiff xdu$ cd fmscripts/

mac-xdu:fmscripts xdu$ sudo make install

3) edit subversion's configuration to use fmdiff, fmdiff3, fmmerge.

mac-xdu:fmscripts xdu$ cd ~/.subversion

mac-xdu:.subversion xdu$ cp config config.bk
mac-xdu:.subversion xdu$ vim config

Three lines I changed: 

diff-cmd = fmdiff

diff3-cmd = fmdiff3

merge-tool-cmd = fmmerge

4) Enjoy it. Good work, Bruno!

FileMerge will be automatically opened when you do svn merge in command line.  It will also be automatically opened when you do svn diff, so you can see the diff visually. For example.


mac-xdu:IPhone xdu$ svn diff -r 4821:4866 .

How to have two installations of xcode.

By default xcode is installed in Developer directory of your drive. You can change the location from Developer to something else so it will not overwrite the previous installation. For me, I have xcode 3.2.6 previously installed under the default location. Now I have xcode 4.0.2 installed in xcode_402 directory.