[Openerp-community] GitHub Projects: rename "master" to "8.0"?

classic Classic list List threaded Threaded
7 messages Options
Reply | Threaded
Open this post in threaded view
|

[Openerp-community] GitHub Projects: rename "master" to "8.0"?

Daniel Reis (SECURITAS SA)-3
Would it be a good idea to rename the "master " branch to "8.0" on the
GitHub projects?

This would match the best practice on Launchpad, where you should series
names after each OpenERP version (6.1, 7.0, ...).
Even if you has a "trunk" branch, it should be under the "7.0" series
and you should `bzr branch lp:project/7.0`.

The problem with not doing so is that you're never sure on what
OpenERP/Odoo version is targeted by the "trunk" (or "master"). It's
supposed to be the focus of development, but you can't be sure if it
targets the latest version or the previous one.

Thoughts?

Regards
Daniel Reis

_______________________________________________
Mailing list: https://launchpad.net/~openerp-community
Post to     : [hidden email]
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp
Reply | Threaded
Open this post in threaded view
|

Re: [Openerp-community] GitHub Projects: rename "master" to "8.0"?

Michael Telahun Makonnen
I use a more or less typical git workflow:

branch: develop - fairly buildable development branch where all
development starts. This includes feature changes and updates to latest
version of Odoo.

branch: master - production ready code for latest production version of
Odoo. The develop branch is periodically merged in here as it stabilizes
and new features/updates become ready for production.

branch: 7.0 - branched from master. The master branch is periodically
merged in as long as it is on the same Odoo production version. When
master is updated for 8.0 no more merges from master. Bug fixes and
other updates continue as usual except that they are merged directly
from feature/bugfix branches, as the case may be.

branch: 8.0 - same life cycle as 7.0, except that 8.0 specific changes
are merged to master only *after* Odoo 8.0 is released, and *then* 8.0
is branched from master.

I find that this workflow helps me keep my sanity when working with
multiple versions of *almost* identical code. All updates, feature
changes and bug fixes are funneled through master so as long as I
haven't branched the next version of Odoo I can keep merging from master
and feel confident that I haven't missed anything and that (probably)
nothing will break. The only time I need to think about something is
when Odoo transitions to the next release. For a while I will have to
juggle updates to two production releases, but after a while this no
longer applies as I start to focus more and more on the "current"
production release.

Regards,
Mike.

On 07/02/2014 03:27 PM, Daniel Reis wrote:

> Would it be a good idea to rename the "master " branch to "8.0" on the
> GitHub projects?
>
> This would match the best practice on Launchpad, where you should series
> names after each OpenERP version (6.1, 7.0, ...).
> Even if you has a "trunk" branch, it should be under the "7.0" series
> and you should `bzr branch lp:project/7.0`.
>
> The problem with not doing so is that you're never sure on what
> OpenERP/Odoo version is targeted by the "trunk" (or "master"). It's
> supposed to be the focus of development, but you can't be sure if it
> targets the latest version or the previous one.
>
> Thoughts?
>
> Regards
> Daniel Reis
>
> _______________________________________________
> Mailing list: https://launchpad.net/~openerp-community
> Post to     : [hidden email]
> Unsubscribe : https://launchpad.net/~openerp-community
> More help   : https://help.launchpad.net/ListHelp

_______________________________________________
Mailing list: https://launchpad.net/~openerp-community
Post to     : [hidden email]
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp
Reply | Threaded
Open this post in threaded view
|

Re: [Openerp-community] GitHub Projects: rename "master" to "8.0"?

Dominique Chabord
In reply to this post by Daniel Reis (SECURITAS SA)-3


Le 02/07/2014 14:27, Daniel Reis a écrit :
> It's
> supposed to be the focus of development, but you can't be sure if it
> targets the latest version or the previous one.

I thought it targets the NEXT one and the next one will be V8 when
published.



--
Dominique Chabord - SISalp


_______________________________________________
Mailing list: https://launchpad.net/~openerp-community
Post to     : [hidden email]
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp
Reply | Threaded
Open this post in threaded view
|

Re: [Openerp-community] GitHub Projects: rename "master" to "8.0"?

Daniel Reis (SECURITAS SA)-3
> I thought it targets the NEXT one and the next one will be V8 when
> published.

Yes, right now we have "7.0" for current stable, and "master" for next
version (v8).

But what happens after v8 is released?
We keep an convention that in the future "master" means last stable?

If so when v9 is about to be released, precursory migration should go
in feature branches (since "master" is for v8 stable). And the "8.0"
branch would only be created when v9 is released...


/DR

_______________________________________________
Mailing list: https://launchpad.net/~openerp-community
Post to     : [hidden email]
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp
Reply | Threaded
Open this post in threaded view
|

Re: [Openerp-community] GitHub Projects: rename "master" to "8.0"?

Leonardo Pistone - camptocamp
I have the impression that the situation is not a tipical git
workflow, since the 7.0 branch is not version 7.0 of the addons, but
contains addons for version 7.0 of odoo.

For that reason, probably it is more sane to call the branches
targeting the future v8 8.0 even if that version does not exist yet.

Another option could be to always use the same branch name of core
odoo. In that case, we would have "master" to go with odoo master, and
when odoo/odoo will create a 8.0 branch we do the same.

I am not sure about which one I prefer :)

On Wed, Jul 2, 2014 at 3:23 PM, Daniel Reis <[hidden email]> wrote:

>> I thought it targets the NEXT one and the next one will be V8 when
>> published.
>
>
> Yes, right now we have "7.0" for current stable, and "master" for next
> version (v8).
>
> But what happens after v8 is released?
> We keep an convention that in the future "master" means last stable?
>
> If so when v9 is about to be released, precursory migration should go in
> feature branches (since "master" is for v8 stable). And the "8.0" branch
> would only be created when v9 is released...
>
>
> /DR
>
>
> _______________________________________________
> Mailing list: https://launchpad.net/~openerp-community
> Post to     : [hidden email]
> Unsubscribe : https://launchpad.net/~openerp-community
> More help   : https://help.launchpad.net/ListHelp

_______________________________________________
Mailing list: https://launchpad.net/~openerp-community
Post to     : [hidden email]
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp
Reply | Threaded
Open this post in threaded view
|

Re: [Openerp-community] GitHub Projects: rename "master" to "8.0"?

Ovnicraft
In reply to this post by Daniel Reis (SECURITAS SA)-3



On Wed, Jul 2, 2014 at 7:27 AM, Daniel Reis <[hidden email]> wrote:
Would it be a good idea to rename the "master " branch to "8.0" on the GitHub projects?

This would match the best practice on Launchpad, where you should series names after each OpenERP version (6.1, 7.0, ...).
Even if you has a "trunk" branch, it should be under the "7.0" series and you should `bzr branch lp:project/7.0`.

The problem with not doing so is that you're never sure on what OpenERP/Odoo version is targeted by the "trunk" (or "master"). It's supposed to be the focus of development, but you can't be sure if it targets the latest version or the previous one.

Following git workflow master is under development, it means developers works on master with latest unstable, when 8.0 be ready to be released OCA must create a new branch 8.0

Add a little explanation in README could help to people who comes from bzr, git fans got it clear.

Regards,

Thoughts?

Regards
Daniel Reis

_______________________________________________
Mailing list: https://launchpad.net/~openerp-community
Post to     : [hidden email]
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp



--

_______________________________________________
Mailing list: https://launchpad.net/~openerp-community
Post to     : [hidden email]
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp
Reply | Threaded
Open this post in threaded view
|

Re: [Openerp-community] GitHub Projects: rename "master" to "8.0"?

Joël Grand-Guillaume @ camptocamp
+1


On Wed, Jul 2, 2014 at 4:37 PM, Ovnicraft <[hidden email]> wrote:



On Wed, Jul 2, 2014 at 7:27 AM, Daniel Reis <[hidden email]> wrote:
Would it be a good idea to rename the "master " branch to "8.0" on the GitHub projects?

This would match the best practice on Launchpad, where you should series names after each OpenERP version (6.1, 7.0, ...).
Even if you has a "trunk" branch, it should be under the "7.0" series and you should `bzr branch lp:project/7.0`.

The problem with not doing so is that you're never sure on what OpenERP/Odoo version is targeted by the "trunk" (or "master"). It's supposed to be the focus of development, but you can't be sure if it targets the latest version or the previous one.

Following git workflow master is under development, it means developers works on master with latest unstable, when 8.0 be ready to be released OCA must create a new branch 8.0

Add a little explanation in README could help to people who comes from bzr, git fans got it clear.

Regards,

Thoughts?

Regards
Daniel Reis

_______________________________________________
Mailing list: https://launchpad.net/~openerp-community
Post to     : [hidden email]
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp



--

_______________________________________________
Mailing list: https://launchpad.net/~openerp-community
Post to     : [hidden email]
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp




--


camptocamp
INNOVATIVE SOLUTIONS
BY OPEN SOURCE EXPERTS

Joël Grand-Guillaume
Division Manager
Business Solutions

+41 21 619 10 28



_______________________________________________
Mailing list: https://launchpad.net/~openerp-community
Post to     : [hidden email]
Unsubscribe : https://launchpad.net/~openerp-community
More help   : https://help.launchpad.net/ListHelp