Subversion是否合并diff或仅更新未修改文件的修订版本

We have some feature branches that can get put on ice for a few weeks at a time. After making many changes in the trunk, is it best to merge the changes from trunk into the branches or drop the branch and create a new branch directly from the trunk and copy the changes from the starting branch into it.We have some feature branches that can get put