Subversion: How to merge only specific revisions into trunk when multiple consecutive changes are made in a branch?

Question

I have been using TortoiseSVN, svn, and subclipse and I think I understand the basics, but there\'s one thing that\'s been bugging me for a while: Merging introduces unwante

Answer 1

Well to clarify a thing about merge is that it actually has 2 steps.

1. Merge
2. Commit

So that means that after your merge is done, you can do a manual diff against head and the other branch to make sure that the merge was correct. And if something was wrong with it, like in your case, you can manually fix it before the commit.

/Johan