1. Mailing Lists
  2. Contributors
  3. Re: Proposal for new workflow, incorporating "Optimistic Merging"

Contributors mailing list archives

contributors@odoo-community.org

Browse archives

Re: Proposal for new workflow, incorporating "Optimistic Merging"

Re: Proposal for new workflow, incorporating "Optimistic Merging"

Avatar

Re: Proposal for new workflow, incorporating "Optimistic Merging"

by
Leonardo Pistone
- 06/06/2016 12:46:48 
I agree with the general idea, thanks! I have some specific remarks though.

What happens often in open source is that merges are made to a
mainline branch (this can be called trunk, master, develop, next...).
Then maintainers make a releases with some extra review and testing.
(a release is an annotated git tag, optionally with merge to a stable
branch). We should then use those releases in our projects instead of
git hashes as we do now. If we need a bugfix, we should try to make
the effort to make a release (otherwise they are almost worthless).

I think this mainline + releases strategy would be good for us as well.

To avoid doubling the burden on maintainers, we do optimistic merges +
releases. The merges could be (almost) automatic after a few days if
the build is green and no-one blocked the PR explicitly.

On the other hand I would block if unsure if that is the right branch,
and in general I would try to avoid to force maintainers to
cherry-pick/filter-branch at every release. This is painful,
error-prone, creates conflicts etc. The goal should be that all green
modules that have not been blocked should be released, eventually with
a bit of extra work and review when merging. Exclusion (so
filter-branch and friends) should be the exception IMO.

On Mon, Jun 6, 2016 at 12:23 PM, Eric Caudal <eric.caudal@elico-corp.com> wrote:
> Stable branch (current one) will keep the PM strategy to keep quality
> standards.
>
> --
> Eric Caudal [Founder and CEO]
> Skype: elico.corp. Phone: + 86 186 2136 1670 (Cell), + 86 21 6211 8017/27/37
> (Office)
> Elico Shanghai (Hong Kong/Shenzhen/Singapore) Odoo Gold Partner, best Odoo
> Partner 2014 for APAC
> On 06/06/2016 06:08 PM, Nhomar Hernandez wrote:
> 
 cite="mid:CAKtu5Y4JDZyOzGngJrWY9rtXEAWrm4yeK8JtBKjb4fiSs6KVjg@mail.gmail.com"
> type="cite">We have projects where PM is mandatory and others where OM is
> mandatory, can we have different strategies?
>
>
> _______________________________________________
> Mailing-List: http://odoo-community.org/groups/contributors-15
> Post to: mailto:contributors@odoo-community.org
> Unsubscribe: http://odoo-community.org/groups?unsubscribe

Reference