Here at Mozilla, a bunch of webdevs use git svn instead of plain Subversion to interact with our svn repositories – mostly because of in-place branching, better merging, and all these things that make a dev’s life happier.

As you probably know when reading this article, you push all uncommitted changes to the remote svn repository by typing git svn dcommit. This will take your last, say, five commits, push them to SVN, and mark them locally as committed. But what if you only want to dcommit some of your changes?

(If you don’t need explanations, jump straight to the summary).

Step 1 (optional): Reorder commits

I am not going to go into a lot of detail on interactive rebasing (git rebase -i), but to start off, make sure your commits are ordered, so that the ones you do want to commit to SVN are before the ones you do not want to push up-stream for now. Example: If in the following history, you want to commit all changes but a023fea, you want to rebase your commits so a023fea is last:

In git rebase -i HEAD~4, change…

pick 07c26c5 some de L10n
pick a023fea adding free-text messages to localizer dashboards
pick 8597f47 adding featured collections as l10n category
pick 19f3df3 making existing localizer pages work with amo2009 layout

… to…

pick 07c26c5 some de L10n
pick 8597f47 adding featured collections as l10n category
pick 19f3df3 making existing localizer pages work with amo2009 layout
pick a023fea adding free-text messages to localizer dashboards

Make sure to resolve any merging problems that might occur due to the reordering.

Step 2: Step in between commits

To only push the desired commits to svn, execute another git rebase -i and mark the last desired commit for editing (by changing pick to edit):

pick 07c26c5 some de L10n
pick 8597f47 adding featured collections as l10n category
edit 19f3df3 making existing localizer pages work with amo2009 layout
pick a023fea adding free-text messages to localizer dashboards

When exiting the editor, git will drop you off after the marked commit, but before the one you don’t want, as a quick look at git log can tell you.

Step 3: dcommit desired changes

After making sure this is really what you want, just execute git svn dcommit as usual and watch git push all desired changes to SVN, while omitting the rest.

Step 4: Fast-forward to HEAD

When the dcommit is done, remember we are still in the middle of a rebase, so just run git rebase --continue to fast-forward to the HEAD of your branch. Again, a quick look at git log can reassure you that only the changes you wanted to have been pushed to SVN.

Success!

Summary: Quick cheat sheet

Here’s a quick cheat sheet for you (and me) to come back to in case you forget:

  • Reorder commits (git rebase -i HEAD~4) so that the undesired ones are after the ones you want to push
  • In your commit history, jump right after the last wanted commit by marking it for editing in git rebase -i
  • git svn dcommit
  • git rebase --continue

Read more…

Here’s another, beautiful specimen in my little collection of what I have called “fail pets” for awhile now: Github.

Github Fail-Unicorn

I wonder if their pink fail-unicorn is somehow related to the similarly colored (but less angry) Django Pony. A distant relative, maybe – especially since the “original” Django pony was, in fact, a unicorn.

(Before someone is urged to remind me, yes, to my knowledge, github is written in ruby, not Python/Django.)

Read more…

If you are an American expat, or something along those lines, and are in the mood for some Christmas music, you might have already taken a look at “iTunes Radio”, and had a hard time to find any, because even the ones carrying Christmas in their name don’t quite cut it…

A good trick is to go for the Adult Contemporary section:

iTunes Radio

… and select a soft rock station, such as “Soft Rock from St. Louis”, which is what we listened to today. These stations have a tendency to switch to Christmas music during the season, and should serve all your Christmas music needs, even if there’s no way you can receive it on your local radio tuner.

Have fun, and happy holidays.

Read more…

When skimming through my pending Mac OS X upgrades this morning I noticed one saying:

This update eliminates the noise made by the optical disk drive during system startup and wake from sleep on MacBook computers.

Wow. As long as I’ve been using a Mac, the sweep-sweep noise has been characteristical for a Mac startup sound, reminiscent of the floppy drive seek sound computers made when they still came with floppy drives (yes, dear children, I am that old).

I wonder what this was for in the first place. Maybe to find out reliably if there is a disc in the drive already? <crystal ball>Possibly, the operating system did not check again and just relied on the hardware status flag being set correctly on startup, and if it was wrong, evil things could happen?</crystal ball> And now, almost suddenly, the Mac engineers found out that it is unnecessary altogether? The wonders of Snow Leopard.

What comes next? Removing the gong on boot to avoid Mac-obsessed college kids from making fools of themselves during lectures? ;)

Read more…

Zombies Invade San Francisco!For the longest time, I was sending my laptop to “hibernation” mode every night. Why? Not because I particularly mind the minute power consumption it might have while sleeping, but because it would randomly wake up during the course of the night. My “zombie laptop” would particularly annoy me because it’d log back into my messaging service in my absence (thus prompting people to think I am awake at 3 a.m.), get unnecessarily warm (due to its being closed), and when I opened it back up, it’d not switch its monitor back on (due to a feature that OS X calls “clamshell mode”).

Today, I had enough, and after a little more googling, I stumbled across a comment in a macosxhints article mentioning Bluetooth settings: Apparently, there’s a setting for letting bluetooth devices power your Mac up from sleep. As I have a bluetooth-based wireless Mac keyboard, I tried out switching that setting off – and long story short, it seems to have worked.

If you have the same problem, uncheck the following box in System Settings / Bluetooth / Advanced Settings to give it a shot:

Bluetooth Wake

Happy zombie-Mac killing!

Read more…

While stumbling across the net, I found this, The New Yorker’s Thanksgiving cover from 2006:

The New Yorker: Thanksgiving

The illustration feels a little sad, though I am not sure what I am sadder about: That they can watch football and I don’t ;) Or that digital distractions take away from the traditional family gathering called Thanksgiving.

(via YayEveryDay)

Read more…

Just recently, my colleague oremj published a bookmarklet making “assign this bug to me” a one-click operation in bugzilla.

Obviously, bookmarklets are fun and games, but Jetpacks are even more awesome, so I went ahead and wrote one that adds an “assign to me” button next to the assignee field:

Assign-to-me button jetpack

You can find and install the jetpack through my jetpacks page on github.

Read more…

Just in time for the recent 20th anniversary of the fall of the Berlin Wall, boston.com’s Big Picture has a great collection of photos – both contemporary and recent – that show what the Wall once looked like, and how it looks now. This is great!

The Big Picture: The Berlin Wall

Read more…

MPlayer

Today, I was watching an .avi file that neither allowed me to forward/rewind nor did it say the right total length of the video. At least, it played fine.

Time to fix the AVI index metadata.

Sadly, none of the tools from the “transcode” package whose names so conveniently start with “avi…” (avifix, or aviindex, for example) was able to help. But over here, I found the right command for mencoder (part of the MPlayer package, I think) that will take your audio and video stream, leave it untouched, and rewrite a new, but correctly indexed, file:

mencoder -idx input.avi -ovc copy -oac copy -o output.avi

Hope this helps!

Read more…

In a New York Times article about the fall of the Berlin Wall 20 years ago, they add a schema of a typical section of the German-German border, showing that the “Wall” was not really only a wall, but rather an elaborate combination of measures to keep people from fleeing their own country. Pretty impressive and sad at the same time.

NYTimes: Berlin Wall

Read more…