marblr

A simple way to import commits from git to svn

Wed, 31 Mar 2010 17:23:15 +0100

Disclaimer: I’m posting this because when I googled for a quick solution for importing a few git commits into subversion there was nothing. This might not be perfect, but it worked for me.

The basic idea is to output the patch files from git. This will export a patch file for each commit between these two shas

git format-patch --no-prefix sha1..sha2

Then apply the patch, add and remove everything, and commit

patch -p0 < commit.patch
# Mess about a bit
svn commit -m commit

I wrote a quick ruby script to automate this which you can find at http://gist.github.com/350524. After running git format-patch to create the patch files just run the script in the subversion directory

ruby ~/bin/import_git_patches.rb "/glob/for/patch/files/00*"

Real Time Web Talk at Scottish Ruby Conf

Sun, 28 Mar 2010 02:36:40 +0100

Here are the slides for the talk Makoto and I gave today at Scottish Ruby Conf. Thanks to everyone who came to support us, and for all the positive comments.

Real Time Web - What’s that for?

View more presentations from mloughran.

Removing Vodafone malware that spoils the Snow Leopard party

Fri, 28 Aug 2009 18:00:00 +0100

I had the software for a Vodafone mobile dongle installed on my 10.5 mac which caused a 5 minute beach ball after I installed Snow Leopard. Maybe installing rosetta as prompted would have made it work, but I just wanted to rid myself of this nastiness since I’m not using the dongle any more anyway.

Dear google, this is what I did, YMMV:

Remove the following from /Library/LaunchAgents/

cn.com.zte.usbswapper.plist
de.novamedia.NovamediaDiskSupressor

Remove mac_swapperdemon from system preferences user > accounts > user login items

Remove

/Library/Application support/Vodafone
/Applications/Vodafone mobile connect

Update: also discovered some kernel extensions to remove

sudo rm /System/Library/Extensions/USBExpressCardCantWake_Huawei.kext
sudo rm /System/Library/Extensions/ZTEUSBCDCACMControl.kext
sudo rm /System/Library/Extensions/ZTEUSBCDCACMData.kext

Roaming calls swindle continues...

Sun, 05 Apr 2009 11:16:00 +0100

Since the EU regulations on roaming charges within Europe came into force, I’ve been pleased to receive a handy little text from O2 whenever I enter a new country:

Calls to the UK & the EU cost 35ppm and 18pmm to receive (inc VAT). Further info on freephone 2266. Voicemail works as it does in the UK.

Nice, but they don’t tell you one very important thing: While incoming calls are metered by the second, outgoing ones are rounded up to the next minute! I don’t much like spending 35p to hear “This is the voicemail service… [hangup]”. And it’s not much better when you took 10 seconds to say “Where are you? OK. I’ll be there in 5.”

The current regulations agreed in 2007 are due to expire in 2010, but a proposal to extend them in an amended form are currently in progress. While I’m pleased that the call costs are being reduced slightly year on year (although I wonder whether competition is being stifled), these proposals are much more useful:

Per second billing
Caps on data usage

Unfortunately the data cap is only for wholesale rates between operators, and starting at €1 / MB excluding VAT this June is still outrageously expensive. By June 2011 it will be reduced to €0.50, but that’s another two years, by which point we will all be even hungrier for data. The other proposal is for a cut off limit so that you at least know that the charges will be within some bounds. Useful, if only because the charges are still so steep.

Let’s hope that this goes though, but also that competition kicks in and we see some more competitive deals, especially for data roaming.

See these links from the European Parliament for more information:

SmartSleep

Thu, 26 Feb 2009 12:40:53 +0000

SmartSleep:

Fantastic little tool that automatically chooses sleep (RAM) or sleep + hibernate (disk) based on your battery level.

I used to disable hibernate because of the inordinate time it takes for 4GB of RAM to be written to disk. I want to sleep and go NOW without worrying that my delicate hard disk is still spinning half way down the street!

I just discovered this old logo that I created on my Toshiba...

Sun, 05 Oct 2008 00:45:33 +0100

I just discovered this old logo that I created on my Toshiba Portégé 3500 tablet PC. The pressure sensitive touchscreen was really cool! And yes, cloaked in the mist of time, I choose to forget the countless hours I spent getting the damn thing to work with Linux ;)

Dear Google, please look here!

Sat, 04 Oct 2008 21:53:22 +0100

Friends of Carmarthen Museum has some fascinating articles on the history of Carmarthenshire which should be googleable!

Doha Airport After 10 Hours…

Sun, 10 Aug 2008 04:37:00 +0100

Doha Airport After 10 Hours…

UNIQLOCK

Wed, 11 Jun 2008 18:42:19 +0100

UNIQLOCK:

Brain hypnosis. So creative. Does it ever repeat?

Tinydb.org

Tue, 13 May 2008 08:31:21 +0100

Tinydb is a fantastic way of storing structured data inside a tiny url.

It’s a database in the cloud without any security, querying, editing… basically anything. However since it runs on the Google App Engine the data is actually being stored on a Google Bigtable. Clearly, it’s the best place in the world for the most useless data I can possibly imagine!

I am happy to announce that you can now chirp merrily away on mloughran.com knowing that it’s costing me about 15 bytes of memory (the url of the most recent comment).

I needed to use mysql and php...

Wed, 09 Apr 2008 19:10:00 +0100

Problem: built in php can’t find macports installed MySQL on OS X Leopard.

Solution:

sudo cp /etc/php.ini.default /etc/php.ini
mysql.default_socket = /private/tmp/mysql.sock in php.ini
restart apache

Why data matters

Tue, 25 Mar 2008 11:09:19 +0000

Why data matters:

Google isn’t merely interested in all the data on the internet. They would like to store every interaction of every human being with every piece of that data. Running MapReduce on that data set must be so much fun.

OneLessDesk

Tue, 18 Mar 2008 14:42:13 +0000

OneLessDesk:

Unfortunately I just bought a new desk…

Great error text from Camino - you don’t want to see the...

Fri, 14 Mar 2008 18:08:52 +0000

Great error text from Camino - you don’t want to see the boring wordy paragraph that Safari spits out. Safari isn’t always the greatest.

Do not use 123-reg

Tue, 04 Mar 2008 17:33:52 +0000

I cannot believe their site is so bad.

It’s absolutely criminal. They spend loads of time making their front end website really nice and pretty to get people to sign up but then provide the worst management tools I’ve ever seen.

There is no navigation, no style, no IA, no logic, no usability. Random static text, forms with existing values not pre-filled, and timeout errors as they connect to internal and registry services. There is simply no excuse for this. Such a waste of my time just to change an A record.

Optical illusion: grayscale colour photo!

Mon, 25 Feb 2008 08:55:00 +0000

Optical illusion: grayscale colour photo!:

Best optical illusion I’ve seen for a while! I bet I could find out how this works too and make my own.

Rubular

Thu, 31 Jan 2008 09:33:55 +0000

Rubular:

This is so simple! Such a nice way to play around with regular expressions (ruby).

I really really hope they didn’t use a real instrument for...

Sat, 26 Jan 2008 11:19:46 +0000

I really really hope they didn’t use a real instrument for this…

I wonder what this was inspired by…

Fri, 25 Jan 2008 13:46:18 +0000

I wonder what this was inspired by…

My favourite MacHeist app wasn’t the reason I bought the...

Mon, 21 Jan 2008 00:55:00 +0000

My favourite MacHeist app wasn’t the reason I bought the bundle. Indeed it was the app, CoverSutra, which I’d dismissed as “who need another iTunes launcher - I’ve got quicksilver”. Turns out it’s not just shiny, but it’s really really handy! The one button HUD for iTunes is great. Just like the Things HUD, it does it’s job vanishes. No nonsense.

Genius feature: CD jewel case on the desktop, complete with gratuitous shininess!

If you’re wondering about the beautiful photo, my friend and incredible cellist Rowena is half of the Calvert Turner Duo. Stunning photos and brilliant music!