I can never remember how to merge a Subversion branch into trunk. So for future reference, here is how it’s done.

First, get a working copy of the head revision of trunk.

svn checkout svn://svnserver/project/trunk project

Next, merge the branch with your working copy.

svn merge svn://svnserver/project/trunk svn://svnserver/project/branches/branch project

Finally, commit the results of the merge.

cd project
svn commit -m "Merging branch X.X.X into trunk."

You can also specify a revision number in your merge.

svn merge svn://svnserver/project/trunk@223 svn://svnserver/project/branches/branch@223 project

That’s it.

Because I always forget how…

sudo apt-get install libmagickwand-dev
sudo gem install rmagick

and you reference it in code like so:

# Don't forget the capital "RM"!
require 'RMagick'
include RMagick

*I’ve only done this using Ubuntu 9.04. Your mileage may vary.

A few weeks ago I began having problems with my Linksys NAS200. At the time, I couldn’t discern whether it was a hard drive failure or a problem with the NAS200’s disk controller. The status message within the NAS200’s administrative panel suggested that the drive had been “removed”. I received no alert message and proceeded to diagnose the problem to the best of my abilities.

After some thought, I devised a plan to back up the remaining good disk, power down the NAS200, and replace Disk 1 with a new hard drive. I purchased an Eagle Consus M-Series external drive enclosure and a spare Western Digital 500 GB hard drive for a total of $102.95. I placed the order last Saturday and UPS delivered the package to my door on the following Tuesday.

Last night I backed up the files on my Linksys NAS200 using the Eagle drive enclosure and a spare 250 GB SATA drive that I had laying around. Transferring the files from my NAS200 to the external drive was painful. At speeds between 900 KB/sec and 1.9 MB/sec, I decided to make a sacrifice and chose not to include my music and movie collection.

Even without my media files the backup still took about nine hours to complete. It’s almost inevitable that my wife is awake at 3 AM. Before bed, I asked her to wake me up so that I could check on the progress of the backup. I didn’t want to risk having the USB drive enclosure overheat and foil my plans. My wife is more cheerful than I am at 3 o’clock in the morning. She woke me up as planned and I stumbled from the bedroom to sit on the floor in front of the NAS200. The backup was complete.

Do not attempt to insert a hard drive into your NAS200 in the dark. Remember the puzzling “ribbon” that I found in each of the drive bays? Well, half of the ribbon is encased in plastic. I didn’t even think about it last night and ended up turning Disk 1’s ribbon into an accordion. In the dark, at 3 AM, I thought the drive was properly seated. I turned on the device and waited. The Disk 2 LED lit up brightly. I waited some more. Disk 1 remained dark. My wife turned on our living room lights and found me squatting on the floor holding the NAS200 inches from my face. Within the glow of the incandescents I could tell what I had just done.

I had to shake the NAS200 (gently) to remove the disk that I had just securely wedged into the first drive bay. Once the drive was removed I decided to try again in the morning. With proper lighting and a few more hours of sleep, I carefully inserted the new drive and pressed the power button. The NAS200 whirred and its lights began blinking. Disk 2… Disk 1… Disk 1! According to what I had previously read, The NAS200’s disk LEDs alternate when mirroring. My NAS200’s lights were doing just that.

After work I noticed that both disk lights were solid indicating that both drives were active. I checked the NAS200’s administrative panel and both drives were listed as “Used by RAID 1”. Satisfied, I mounted the shares and proceeded to browse through my files. Everything was there!

My original NAS200 review has over ninety comments and both the Linksys community forums and linksysinfo.org are filled with posts left by people inquiring about the device. I’ve read a lot of bad reviews and received quite a few disparaging comments regarding the reliability of the NAS200. I bought it knowing it was new on the market. Trusting the Linksys brand name, I figured it’d be a sturdy device and for eighteen months it has been.

It’s just as foolish to rely on a single device as it is a single hard drive for safe file storage. Hardware will always fail. That said, I’ve begun to work on an off-site storage strategy for my home backups. I’ll be posting more on this when I’ve worked out the details.