Bernard's Technocratic Blog


SVN Appreciation
September 15, 2009, 1:04 pm
Filed under: SVN | Tags:

Our team has a dedicated build engineer.  However, when that person is on vacation, I take over.  Now I don’t know all the intricacies of SVN, but I sure can find out.

We released some code this past weekend and ideally, we should cut the branch so that we can preserve the last production build.  This is a good practice to have in case for possible roll backs or file comparisons in the future.

The problem that I faced is that the branch was not cut and within a day or two, there have been over 100 changes.  So how do we resolve this issue?

I know this is very obvious and almost not worth writing about, but I write it as appreciation to svn and a reminder to those who forget the neat things about version controlled systems.

So I found this site to be helpful:

http://aralbalkan.com/1381

The basic commands from the blog (with corrected syntax):

  1. svn merge --dry-run -r 73:68 http://my.repository.com/my/project/trunk
  2. svn merge -r 73:68 http://my.repository.com/my/project/trunk
  3. svn commit -m "Reverted to revision 68."

It works beautifully and I was able to preserve the last production release code.

Having this system really saved a lot of overhead time when maintaining different branches.

Also, it's nice to validate the changes using the svn diff command:

svn diff branch 1 branch 2


No Comments Yet so far
Leave a comment



Leave a comment
Line and paragraph breaks automatic, e-mail address never displayed, HTML allowed: <a href="" title=""> <abbr title=""> <acronym title=""> <b> <blockquote cite=""> <cite> <code> <pre> <del datetime=""> <em> <i> <q cite=""> <strike> <strong>