If you are tracking merges manual in Subversion (SVN) you need to automate merge tracking with svnmerge.
Check out this excellent tool at:
- Cory
Development blog discussing configuring, building, and managing software. Including coverage of Debian Linux, .NET development projects, Perl and development tools