Excluding files on branch from merging?

(Hi. I'm rather new to working with version control, and, of course,
delighted with it.)

Now I have a problem I couldn't find covered in the SVN book. The situation:
I have a set of HTML templates in my trunk, which I'll call the "default
skin" for my web app. Then I have a "customer-specific skin", which contains
exactly the same files, a few of which have been changed, and even fewer
have been totally replaced by different code.

I understand that for such layouts, you should create a branch (which will
exist forever, without ever being merged back into the trunk). Now when I
make changes in the trunk, most files in the branch should be updated/merged
to these changes, but the few files that are totally different should not be
affected by this, they're not mergeable anyway and I suppose I will just
have to adapt them myself when the trunk is changed.

However I was not able to find out how to exlude specific files from being
merged/updated. Adding them svn:ignore would do the trick, but then changes
to the ignored files wouldn't be committed either. Setting locks seems not
what I want. Has anybody got a suggestion for me?

-- 
"Feel free" - 10 GB Mailbox, 100 FreeSMS/Monat ...
Jetzt GMX TopMail testen: http://www.gmx.net/de/go/topmail
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org