ailon's DevBlog: Development related stuff in my life

Merging SVN branch back to trunk with TortoiseSVN

3/31/2009 4:38:35 PM

This post is mostly a note to self, cause if I don’t do this for some time I forget how to do it and spend quite some time figuring things out. Actually this is quite a simple task but awkwardly implemented (from my point of view).

Now I did it for a second time in 2 weeks and managed to merge my branch back to trunk from the first attempt, so I decided it’s good ocassion to write things down so I don’t waste time the next time I forget the procedure.

So, here’s what you do after you are finished working on your branch and want to merge everything back to trunk:

  1. Make sure you’ve commited everything to your branch.
  2. Backup your whole working copy (just in case :)
  3. Switch your working copy to trunk: Right click->TortoiseSVN->Switch. Select your trunk URL, HEAD revision and press OK.
  4. Merge (this is the awkward part): Right click->TortoiseSVN->Merge. In from box select URL of your trunk (HEAD revision), uncheck Use “From:” checkbox in To section and select branch URL in To box. Test wit “Dry run” and press “Merge” if everything is correct.
  5. Commit to trunk

That’s it.

Bonus track: here’s a good article on minimizing merging conflicts when working on branches.

Tags: , ,

TortoiseSVN installation

10/23/2007 9:52:44 AM

For quite some time TortoiseSVN was shouting that I have to upgrade my installation cause I used a version which apparently had a security hole. After refusing to comply for some time I finally gave up. I've downloaded and installed version TortoiseSVN 1.4.5, Build 10425 which to my surprise, among other apps, required that I "exit" Windows Explorer!

I've killed all the "reasonable" applications it required but refused to do the same with Explorer and hit "Ignore". After the reboot TortoiseSVN couldn't launch stating (or was it Windows?) that "The application has failed to start because its side-by-side configuration is incorrect."

I needed to work with SVN badly, so I ran tortoise's installer again and ordered it to repair my installation. No surprise it asked again that I kill Windows Explorer. This time I complied (no matter how crazy this might seem) and it went "smoothly". I wonder when my whole system is going to crash...

I wonder if this is Vista-only issue or everyone has to kill Windows Explorer to install TortoiseSVN? Sounds completely nuts to me.

Tags: , , ,

Copyright © 2003 - 2017 Alan Mendelevich
Powered by BlogEngine.NET 2.5.0.6