Any time, after a little to long on a branch, that I go to merge back to trunk, I seem to forget the magic steps involved in making this easy. For my own reference, tag the head of the branch and then:
`
svn log http://example.com/url/to/branch --stop-on-copy
` … will get us the revision that the branch happened from. Let’s say it’s 27101. `
svn diff -r27101:HEAD http://example.com/url/to/branch --summarize
` … will let us know of all the files that have changed between that revision and the head of the branch. Then you’re free to take a trunk check-out and do a merge with full knowledge of what’s happened.