You must install drupal-mode from https://github.com/nyuhuhuu/drupal-mode/blob/master/drupal-mode.el

You may need to create the ~/.emacs.d/plugins/drupal-mode-el/ directory to put the drupal-mode.el file into.  And on Debian/Ubuntu you will probably have to install the w3m-el package – but after that you have a Drupal specific php-mode called drupal-mode.

This fixes the issue whereby arrays in php-mode are not indented in the same way that Drupal Coding Standards specify.

I don’t normally do this – but today – in a rush – I hit Ctrl-Alt-Del dring POST on a new HP mail server being set up.  And when the server came back up on of the two RAID 1 drives had its amber light on showing drive failure – Doh!

I shut the server down – pulled the drive out and pushed it back in again – and powered back up.  The drive is now showing the 1 second green flash to show that it is being rebuilt.  Hopefully, the drive should be OK as the server is brand new and it was my forced reboot which caused the error.

As a side note – just how do you reset the NIC on a Debian server after a config change these says.  It used to be an easy:

# /etc/init.d/networking restart

but that doesn’t seem to work any more.  Maybe I should be using this new ‘ip’ command somehow?

This is an annoyingly simple issue – so simple that it may not be blogged elsewhere.

You have a remote repository and push some code updates to it from a local repository – you then switch to a different local repository and pull down the updated code from the remote repository with:

$ git pull origin mybranch

which updates your local mybranch nicely.

Now when you run

$ git status

it says everything is up-to-date – but you get the horrible ’Your branch is ahead of ‘origin/master’ by x commits’ message – WTF!

What this is saying is that your local branch – mybranch – is ahead of your local copy of the remote – origin/mybranch.

See – your local copy of origin/mybranch (in this case origin/6.x-1.x) still points to the previous commit.

The thing is – I was being too clever and trying to avoid pulling and updating master.  What I should have run was:

$ git pull origin

This will fetch and merge the current branch from the remote to my local branch- and also update my local tracking branch – origin/mybranch – to point to the latest commit.

If you run

$ git pull origin

after running

$ git pull origin mybranch

it seems to be safe and to sort out the issue of ’Your branch is ahead of ‘origin/master’ by x commits’.

Hopefully this quick note might help someone who found themselves in the same position as me.

As of the 1st of October 2011, Freeway Projects has moved to a new office at Salt Quay House in Sutton Harbour, Plymouth. Our new office, which is on the fourth floor, has an amazing view over the marina, and is a great place to work from, and we are hoping the move will help to provide quality service to our clients.

Why not pop in and see us over a cup of coffee, admire the view and maybe even talk business!

Our new full address is:

4th Floor Salt Quay House,
6 North East Quay,
Sutton Harbour,
Plymouth,
PL4 0HP