When is a branche necessary?

Hello,
we've recently switched to Subversion a Version Control, we where
using Source Safe before...

The project in SS was organized as a main line of developement with
all our source code (the "trunk") and some different projects for the
different clients with only the small changes in the few configuration
files. So, no source code in those "branches", only a few conf files.
This was really useful because we were able to develop in the "trunk"
only and at build time a script was building code on the trunk and at
the end it overwrote the conf files with the client's before packaging

Now I moved the main project into the newSvnProject/trunk/src and then
I created the different branches for the clients:

newSvnProject/branches/ClientA/src...
newSvnProject/branches/ClientB/src...

I switched to those clients in turn, overwrote the few conf files and
committed. OK

But now, I have to remember to syncronize my branch with the trunk
changes before I build the code for, say, client A. Isn't this a
complication? It is a waste of time, because a developer must manually
merge the changes before a build. How do you solve this? Can I
automate the process somehow? Another idea would be: build on the
trunk always and then include the configuration files from the branch,
but it looks different form the suggested use case.

thanks for your suggestions

-- 
TREMALNAIK
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org