Re: Managing branches

El lun, 02-01-2006 a las 19:37 +0100, Karin van den Berg escribió:
> Hi everyone,
>

Hi!

> I am a freelance programmer, and for one customer I have to manage a
> project that is being offered to several of his clients. Each version
> has slight differences but many things are the same, and so many changes
> need to be applied to all versions.
>
> I have worked out how to branch the project and also how to use 'svn
> merge' in order to apply changes from one branch to the others, however
> it is not working as smoothly as I would like, having to merge for
> example three other branches for each change seperately.
>

It depends strongly on the kind of work you are doing, and how modular
it is. A possible solution for this is to keep all the common part in a
project, say trunk/libs, and prepare it in order to have the differences
in a set of files (obviously, how to do this will depend on what kind of
project you have). Each set of files will be a project
trunk/customer1
trunk/customer2
...

and each of theese projects links to the needed projects under
trunk/libs via svn:externals

With this schema, every change you apply to the core, will be
automagically propagated when you svn update.

Hope this will be useful for you.

If not, please let us know more details.

Regards.

-- 
May the source be with you
---------------------------------------------------------------
Ignacio García Fernández                  Instituto de Robótica
ignacio.garcia_at_uv.es                 Universidad de Valencia
http://robotica.uv.es/~ignacio/            Tlf. +34 96 354 3564