renaming a file on the main trunk, development on a branch goes a head on the old filename, merging the changes

[Heirler Stefan]

hi,

-we develop a new product line on the main trunk
-on a branch the old product line is maintained
-due to new naming conventions we have to rename some files in the main
trunk
-from time to time we have to merge bugfixes from the branch to the main
trunk
-merging a renamed file is not possible

is there any workaround to treat this problem?

thanks

stefan