Subversion (SVN) Merging From The Command Line

It is usually pretty straight forward to merge fixes from a branch into the trunk using SVN. Here is a SVN command line example.

1. Check out a pristine up-to-date trunk or use a workspace with no modifications.
2. svn merge https://svn.myorg.com/repos/devteam/myproject/branches/v7.00.4@HEAD .

   $ svn merge https://svn.myorg.com/repos/devteam/myproject/branches/v7.00.4@HEAD .
   --- Merging r110205 through r110328 into '.':
   U    src/java/edu/stanford/irt/frd/layout/StaffLayout.java
   U    src/java/edu/stanford/irt/frd/layout/Layout.java
   U    src/web/social/profileUserfeed.jsp
   U    src/web/public/menlo_profile_printer.jsp
   

3. verify the merge fixes things locally
4. commit the changes to the trunk. SVN will keep track of what has already been merged so that future merges are also easy to do.

   $ svn commit -m "Merging 4.0.1 bug fixes into trunk"
   Sending        .
   Sending        src/java/edu/stanford/irt/frd/layout/Layout.java
   Sending        src/java/edu/stanford/irt/frd/layout/StaffLayout.java
   Sending        src/web/public/menlo_profile_printer.jsp
   Sending        src/web/social/profileUserfeed.jsp
   

Unix Command - watch

I'm sitting here waiting for a huge rsync to complete over a slow network from slow disks to what I hope are faster disks.  To monitor the progress, I'm using the Unix watch command to periodically run a du on the directory being written to.  This gives me an idea of its growth and how far along I am:

watch --interval=1 du -sm /hudson

The -sm options to du just tell it to summarize the size in MB.

Unix Math Calculations

I just ran across http://x-bc.sourceforge.net/index.html. If you've ever used the Unix bc calculator utility, this project provides two excellent extensions to the built in capabilities of the calculator. In particular:

http://x-bc.sourceforge.net/extensions_bc.html

http://x-bc.sourceforge.net/scientific_constants_bc.html

You'll get a wealth of math functions available to you by simply including the extension files avaiable at those URLs.

In order to have these extensions always loaded as well turn on the built in math extensions, you can alias your bc command as follows:

alias bc="bc -l ~/bin/*.bc"