On a project I’m working on, we use subversion, with tortoiseSVN as a client, under windows XP.
As we enter in production and continue development in parallel, many branches are created.
Often, we have to backport modifications made on the branch to the trunk, or to older branches. Backporting is a very delicate task, as many errors can be introduced into the code.
What are your favorite tools to make backporting easier and more secure ? If possible, add only one tool per answer, and vote for your favorite ones.
I am using BeyondCompare. I believe it’s one of the most essential tools for a developper, up there with TortoiseSVN.