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>



Standalone mac battery charger|(0)

Got a spare mac battery? I’ve often wondered why up until now no-one’s produced a standalone charger so that you can charge batteries without having to plug them into the mac. Fortunately Fastmac.com have produced a standalone charger that allows you to do just that. and it’s compatible with iBooks, Powerbooks, macbooks and Macbook Pros. It’s also 110/200v. Exactly what I was looking for!

Django Admin Ominigraffle Stencil|(0)

Colleague Alex Lee has created a nice stencil for omingraffle with the Django Admin UI components, perfect for wireframing customised admin screens. For more details and to download the stencil see Alex’s Blog csensedesign.co.uk

Photos on Flickr

© Copyright 2004-08 Stuart Colville, all rights reserved. May contain traces of Muffin. Powered by WordPress. Hosting by 1&1 This page was baked in 0.703s.