openerp-community team mailing list archive

[Stefan <stefan@xxxxxxxx>]

On 03/07/2014 10:51 AM, Lionel Sausin wrote:
> Dear community,
> I'm considering using the OCB v7 branches to migrate our instance from
> v6.0.
> I'm impressed with the job done and thankful for it.
> I'm just wondering: what's the rational for replicating every commit
> from the official branches? Wouldn't it be enough to have a simpler
> branch, forked off the v7.0 tag and containing only the changes you
> make? Those who use the OCB branches are certainly able to merge the
> official and OCB branches on their own.

Hi Lionel,

thank you for your interest in OCB 7.0!

I see the following advantages to the replay approach:

- having manual merges on a branch makes it very difficult to tracking
the current patch level + additional (manual or merged) changes on top
of that
- conflicts with changes in upstream are guaranteed to be resolved
(there have been a few)
- it also simplifies the installation of OCB: just branch from a
different location. Therefore, instant compatibility with approaches
like buildout or custom scripts to setup OpenERP.

Of course, the downside of the approach is that it is a little more
difficult to track changes which are OCB specific.

Cheers,
Stefan.