Our team creates sole bug-branch, from trunk, intended for bugs-fixing; verifying on PROD, we need to merge codes back into trunk. (We don’t preferr creating one new branch per bug reported)
Our current practice is that using WinMerge compares sb’s modification in bug-branch with counterparts in trunk, and merge. However, manual intervention – e.g., find what files you amended – sometimes makes mergence go wrong, e.g., forget files being merged.
I’d like to know how you use SVN or other tools to faciliate the process?
Consider reading this (if you don’t know yet): http://svnbook.red-bean.com/en/1.1/ch04s03.html#svn-ch-4-sect-3.3