RE: How to avoid conflicts avalanche

[Chris Cameron]

Is this a symptom of your software not being adequately separated into
'core' and 'localised' sections?  We try and separate out the common 'core'
functionality which must not change from the 'localised' functionality which
is needed for each customer.  If there are a lot of merges and conflicts, it
suggests to me that the different country releases aren't really 'standard'
software.

***************************************************************
Chris Cameron                       Open Telecommunications Ltd
Product Manager                           IN Product Management
address@hidden                           P.O.Box 10-388
      +64 4 495 8403 (DDI)                          The Terrace
fax:  +64 4 495 8419                                 Wellington
cell: +64 21 650 680                                New Zealand
Life, don't talk to me about life ....(Marvin - HHGTTG)

> -----Original Message-----
> From: address@hidden [mailto:address@hidden Behalf Of
> Sergiy
> Sent: Tuesday, 26 June 2001 3:45 p.m.
> To: address@hidden
> Subject: How to avoid conflicts avalanche
>
>
> Hi,
>
> Our software has different modifications for different countries. Thus
> in our cvs repository we have the main development trunk, and country
> branches. When we cut a new major release on the trunk, we need to merge
> from the trunk to all country branches. These merges result in a large
> number of conflicts. It requires time and significant programming
> efforts to resolve those conflicts.
>
> One way to avoid this is to do interim merges regularly. The other way
> could be to pursue developers to use some script which automatically
> does the merge to country branches every time they commit to the trunk.
> But they often forget to follow such procedures, and apparently CVS
> doesn't have any way of enforcing this automatically.
>
> The question is, if anybody experienced similar problems and has them
> successfully resolved, what is the most effective solution to this
> problem, and whether CVS provides any means to support that?
>
> Thanks,            Serg
>
>
> _______________________________________________
> Info-cvs mailing list
> address@hidden
> http://mail.gnu.org/mailman/listinfo/info-cvs
>