Subversion: Merging a Branch into Trunk

Posted by Ryan Baxter Wed, 26 Aug 2009 01:21:00 GMT

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.

Installing RMagick on Ubuntu*

Posted by Ryan Baxter Thu, 20 Aug 2009 17:00:00 GMT

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.

Where is _why?

Posted by Ryan Baxter Thu, 20 Aug 2009 13:20:00 GMT

Why the lucky stiff speaking at the Carnegie Mellon Art and Code Symposium. If the rumors are true, you’ll be missed.

ART && CODE Symposium: Hackety Hack, why the lucky stiff from STUDIO for Creative Inquiry on Vimeo.

Older posts: 1 2 3 4 5 ... 30