A difficult situation during using subversion.

Hello, list,

We use the amazing Subversion as the version control system in our
company.

Recently, i find something difficult to solve.

Here it is:

We have a project managed via subversion. Then there are some
requirements that need some very special modification on the source
tree. So we create a branch to handles the special modifications. That's
Okay.

Then problems following, both the trunk and branches we have created are
under developing now, so everyday we would commit many modifications on
the trunk branch, then merge the modifications to the other branch.
During emerging ,there always some conflicts. Plus the special
modifications on the branch are increasing too. So the situation become
more difficult than we expected.

I wonder know that what's wrong we have done? Is there any
misunderstanding on the policy of subversion or anything else?

Every reply is appreciated.

Wang Penghui

-- 
Name.   Wang Penghui | 王 鹏辉
Tel.    0086-592-8389650
Mail.   wangpenghui@gmail.com
Web.    http://www.wangpenghui.name
Blog.   http://www.wangpenghui.name/blog