Muffinresearch Labs by Stuart Colville

BASH: Open FileMerge from CLI | Comments (2)

Posted in Snippets on 16th August 2007, 1:07 pm by Stuart

Here’s a quick tip. If you want to open FileMerge (Apples graphical diff utility available in developer tools) from the CLI you can use the command opendiff e.g: opendiff file1 file2 This save lots of hassle when you are trying to resolve versioning conflicts, as I always find it annoying trying to navigate to the right files from the gui.

Post Tools

Comments: Add yours

1. On September 4th, 2007 at 1:31 pm Ben Ward said:

So, whilst this should be an exercise for the reader, what we’d want is an alias to act like this:

bzrmerge path/to/file.ex

Automatically open FileMerge and fill in the .THIS, .OTHER and .BASE files for us.

Must. Learn. Bash.

2. On September 4th, 2007 at 2:39 pm Stuart Colville said:

That would be pretty easy; add to .bashrc:

function bzrdiff {
if [ $# -lt 1 ]
then
cat <<-END
        Usage: bzrdiff file
        Will automatically compare file.OTHER and file.THIS
END
else
  opendiff $1.OTHER $1.THIS -ancestor $1.BASE
fi
}

remember to source ~/.bashrc for changes to take effect.







XHTML: You can use these tags: <a href="" title=""> <abbr title=""> <acronym title=""> <b> <blockquote cite=""> <cite> <code> <del datetime=""> <em> <i> <q cite=""> <strike> <strong>



Using Loggerhead with mod_wsgi|(0)

Here’s a post I wrote over on the Project Fondue Blog about our use of Loggerhead with mod_wsgi under Apache. Loggerhead is the rather nice branch viewer for bazaar branches as used on Launchpad.net.

If you’re not already subscribed to the Project Fondue blog feed then I can recommend it, as there should be some interesting posts coming out of there in the coming months (yes I’m unashamedly biased!).

Ubuntu: Turn off changing workspace with mouse wheel|(1)

I found the changing with the workspace with the mouse wheel really annoying. To disable it go to System => Preferences => CompizConfig (available if the compizconfig-settings-manager package is installed) and uncheck “Viewport Switcher” which is under the “Desktop” heading.

Photos on Flickr

© Copyright 2004-10 Stuart Colville, all rights reserved. May contain traces of Muffin. Powered by WordPress. Hosting by Slicehost.com This page was baked in 0.656s.