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
If you don't want the unwanted change, do not merge revision 4:5, but just revision 5. It means you merge the change committed in revision 5.