Meld on mac
In my previous life when Ubuntu was my only work station, both at the office and home, I used to have this cool setup: we committed our work (Java project) to a remote SVN repo. Every time someone did a commit, Hudson sent an email to everyone informing them of this commit, and then it did a build. And then Hudson sent email to everyone informing them whether the last commit built successfully or not.
Our email client was Evolution back then. Evolution had a very nifty diff plugin (emails from Hudson always content diff file), with code indentation and coloring. So when someone committed, or something broke, we could quickly see what was committed or what was going wrong (and who did it!).
Then we all moved to Mac workstations.... to start working on iOS projects. It was a pain to get Evolution and its nifty diff plugin to work on Mac. So we switched to Mac's native Mail app.
And we used an additional app to view the diff, which is meld. But this is still less than ideal, since now I had to switch to meld to view the diff. In Evolution, the diff was embedded in the mail, right below the email message, beautified by the diff plugin.
Recently I need to install meld on my private Mac. This was not so smooth (I don`t remember having problems back then). Anyway, here`s how to install meld on Mac via Macports:
$> sudo port install meld
Run meld. And then you may or may not get the following error:
$> sudo port notes dbus
$> sudo launchctl load -w /Library/LaunchDaemons/org.freedesktop.dbus-system.plist
$> launchctl load -w /Library/LaunchAgents/org.freedesktop.dbus-session.plist
From:
http://stackoverflow.com/questions/11892957/meld-on-os-x-10-7-doesnt-work
http://computercamp.cdwilson.us/running-meld-on-osx-107-lion
Our email client was Evolution back then. Evolution had a very nifty diff plugin (emails from Hudson always content diff file), with code indentation and coloring. So when someone committed, or something broke, we could quickly see what was committed or what was going wrong (and who did it!).
Then we all moved to Mac workstations.... to start working on iOS projects. It was a pain to get Evolution and its nifty diff plugin to work on Mac. So we switched to Mac's native Mail app.
And we used an additional app to view the diff, which is meld. But this is still less than ideal, since now I had to switch to meld to view the diff. In Evolution, the diff was embedded in the mail, right below the email message, beautified by the diff plugin.
Recently I need to install meld on my private Mac. This was not so smooth (I don`t remember having problems back then). Anyway, here`s how to install meld on Mac via Macports:
$> sudo port install meld
Run meld. And then you may or may not get the following error:
File "/opt/local/bin/meld", line 75, in
locale.setlocale(locale.LC_ALL,'')
File "/opt/local/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/locale.py", line 539, in setlocale
return _setlocale(category, locale)
locale.Error: unsupported locale setting
If you do, do this:export LANG=C; export LC_ALL=C
And then, if you get the following error: glib.GError: Failed to contact configuration server; some possible causes are that you need to enable TCP/IP networking for ORBit, or you have stale NFS locks due to a system crash. See http://projects.gnome.org/gconf/ for information. (Details - 1: Failed to get connection to session: Not enough memory)
Do this:$> sudo port notes dbus
$> sudo launchctl load -w /Library/LaunchDaemons/org.freedesktop.dbus-system.plist
$> launchctl load -w /Library/LaunchAgents/org.freedesktop.dbus-session.plist
From:
http://stackoverflow.com/questions/11892957/meld-on-os-x-10-7-doesnt-work
http://computercamp.cdwilson.us/running-meld-on-osx-107-lion