svn diff, filemerge, and textmate

April 16th, 2007
Posted by David Lowenfels
Filed in:
filemerge

the scripts mentioned here come in handy… you can check them out via subversion: svn co http://ssel.vub.ac.be/svn-gen/bdefrain/fmscripts/

install them somewhere in your path (I like to use ~/bin)

then set these helper apps in your ~/.subversion/config:


### Set diff-cmd to the absolute path of your 'diff' program.
###   This will override the compile-time default, which is to use
###   Subversion's internal diff implementation.
### diff-cmd = fmdiff
### Set diff3-cmd to the absolute path of your 'diff3' program.
###   This will override the compile-time default, which is to use
###   Subversion's internal diff3 implementation.
diff3-cmd = fmdiff3

you can do conflict resolution with filemerge directly from textmate… with Ctrl-Shift-A -> Resolve Conflicts with FileMerge…

UPDATE: it’s pretty annoying to set diff-cmd to fmdiff… you get filemerge popping all the time when you might not need it. The best of both worlds is to set the Shell Variable in textmate Advanced preferences: variable: TM_SVN_DIFF_CMD value: fmdiff This way you get nice graphical diffs in textmate, but you get the straight up text stuff in the shell.

actionmailer ActionView ActiveRecord activesupport agile ajax alphadecimal audio autotest BDD blocks capistrano ssh ruby console controller css dashboard widget delegate dog puppy naming name DRM email obfuscation exceptions factories factories-and-workers factory pattern filemerge find and replace finder fink fixtures fun functional testing gem gems git google maps haml hash helper helpers imagemagick install Intertrust irb javascript jquery jrails logo macro math meetup model openssl OS X patch Pioneer Electronics plugin polymorphism project management prototype.js rails rails gotcha rails,patch,validations railsconf rake rmagick RSA encryption ruby ruby on rails script scrum scrum lessons rails scrumninja shoulda subversion SyncTV TDD testing textmate tips tricks unique hashes unix shell validation view yaml zebra stripes