Question on branching the right way

Hello,

I read the introductory passages about branching in the svn-book, but I
am still not quite sure, whether branching is the thing I realy want to
do. Maybe someone could help me out.

My application exists in two versions: Main-Version and Custom-Version.
These differ only in that way, that the custom version has some
additional features. Main is in the trunk and Custom is in a branch.

When making changes to Main, I want to be able to apply the changes to
the custom version as well. So far I did that with Merge. Unfortunatly,
if both version share a commen file, that differs only partly, the
custom part of that file gets overwritten by the main version.
To workaround that, I checked out both versions into a directory of
their own and manually copied the changed files. Then, with the
Diff-Function I took care of accepting or reverting changes from the
main version for the shared files. *wew* Sounds complicated.

Is there a right way (or at least a better way than the above) to
accomplish what I am after?

Thanks,
        Sascha

-- 
_____________________________________________________________
    Sascha Herpers
    Universität zu Köln
    Seminar für Supply Chain Management und Produktion
    Albertus-Magnus-Platz
    50923 Köln
    E-Mail: herpers@wiso.uni-koeln.de
    Tel.:   (0221) 4 70 - 37 40
    Fax:    (0221) 4 70 - 51 40
    WWW:    http://www.scmp.uni-koeln.de
_____________________________________________________________
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org