Re: NEWBIE:Question about branching.

[Riechers, Matthew W]

David Bowring wrote:
> 
> I have software which is used for a number of different countries, they
> are very similar maybe a few different features and functions for each
> country.  For example: I will have software for UK, Europe and
> Australia.
> The European and Australian software will be based on the latest UK code
> with a few additions to some files.

Maintaining country-specific code with branches doesn't scale very well.
If you add support for more countries, you would need a seperate branch
for each, which may become unmanageable. A better approach may be to
keep country-specific code on the trunk (in seperate directories or in
conditional code), and configure the build system to pick and choose the
bits for each country release. I see a close parallel to multi-platform
code, which is usually managed in the same way.

-Matt