merge branch into trunk not satisfactory.

[loudking <lo...@gmail.com>]

Hello all, I have checked out a working copy of repository trunk and aims 
to reintegrate a branch into trunk.

trunk $ svn merge --reintegrate --accept=theirs-full 
svn://192.168.1.4/KnowSG.com/branches/branch1
--- Merging differences between repository URLs into '.':
U    sql/ChangeLog.txt
U    sql/Makefile
   C html
   C perl/download_log.sh
U    perl/export_monitor.pl
U    perl/common.pm
U    perl/ChangeLog.txt
   C perl/upload_source_code.sh
   C perl/new_version.pl
   C public_html
U    config/subversion
   C config/development
U    config/svndiffwrap.sh
U    config/ChangeLog.txt
U    config/production/hosts
U    config/production/dovecot.conf
   C config/production/ssl.key
   C config/production/network
   C config/production/main.cf
   C config/production/sub.class1.server.ca.pem
   C config/production/ca.pem
U    doc/work_flow.txt
U    doc/infra.txt
   C Makefile
   C steps/command_at_development.txt
 G   .
Summary of conflicts:
  Tree conflicts: 13

trunk $ svn resolve --accept working html perl/download_log.sh 
perl/upload_source_code.sh perl/new_version.pl public_html 
config/development config/production/ca.pem 
config/production/sub.class1.server.ca.pem config/production/ssl.key 
config/production/network config/production/main.cf Makefile 
steps/command_at_development.txt
Resolved conflicted state of 'html'
Resolved conflicted state of 'perl/download_log.sh'
Resolved conflicted state of 'perl/upload_source_code.sh'
Resolved conflicted state of 'perl/new_version.pl'
Resolved conflicted state of 'public_html'
Resolved conflicted state of 'config/development'
Resolved conflicted state of 'config/production/ca.pem'
Resolved conflicted state of 'config/production/sub.class1.server.ca.pem'
Resolved conflicted state of 'config/production/ssl.key'
Resolved conflicted state of 'config/production/network'
Resolved conflicted state of 'config/production/main.cf'
Resolved conflicted state of 'Makefile'
Resolved conflicted state of 'steps/command_at_development.txt'

trunk $ svn commit -m 'dont know what local modifications are 2'
trunk $ svn update
At revision 345.

But when I do a svn diff I could still see the difference between branch 
and trunk. Can anybody tell me what to do please?
trunk $ svn diff svn://192.168.1.4/KnowSG.com/branches/branch1 
svn://192.168.1.4/KnowSG.com/trunk
Index: public_html/sample.php
===================================================================
2 files to edit
Index: public_html/style.css
===================================================================
2 files to edit
Index: public_html/images/bg_container.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: public_html/en.lang.php
===================================================================
2 files to edit
Index: public_html/zh.lang.php
===================================================================
2 files to edit
Index: public_html/ChangeLog.txt
===================================================================
2 files to edit
Index: steps/command_at_development.txt
===================================================================
2 files to edit

Property changes on: .
___________________________________________________________________
Added: svn:mergeinfo
   Merged /KnowSG.com/branches/branch1:r308-344