To create a diff suitable for merging any branch into the trunk use the following, then apply the patch to trunk and commit.

diff -x ".svn" -r -N -U4 trunk/ branches/X/  > diff