version control - SVN branch to trunk merge doesn't work, only shows "property changes", not code changes -

i have svn 1.6.11 , trying merge mybranch onto trunk. have tried both

svn merge --reintegrate http://ip/path/to/repo/branches/mybranch http://ip/path/to/repo/trunk   svn ci -m "blah" 

and

svn merge http://ip/path/to/repo/branches/mybranch http://ip/path/to/repo/trunk   svn ci -m "blah" 

they both gave me after merge:

$ svn diff  property changes on: . ___________________________________________________________________ modified: svn:mergeinfo    merged /repo/trunk:r23 

and after commit:

sending        trunk 

i not see changes in trunk. when diff trunk version before merge (18) latest version (24), get:

$ svn diff -r 18:24  property changes on: . ___________________________________________________________________ added: svn:mergeinfo    merged /repo/trunk:r20-23 

i don't want property changes. want code changes merged. did wrong?

1. make sure changes committed on branch, in development directory svn commit -m "etc commits"
2. merge changes in trunk branch, i test @ point, , recommit on branch @ point. svn merge http://ip/path/to/repo/trunk ., testing, svn commit -m "merged trunk , passed tests
3. check out trunk - svn co http://ip/path/to/repo/trunk
4. merge branch trunk in working copy of trunk svn merge --reintegrate http://ip/path/to/repo/branches/mybranch .
5. testing, more testing, yet more testing!!!
6. commit on trunk: svn commit -m"my feature merged in"
7. get ready bug reports problems all tests missed.

n.b. svn documentation mentions 2 url or server side merges - "say possible difficult don't try unless really know doing"