Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[10.0][MIG] mgmtsystem_nonconformity_project #191

Closed
wants to merge 1 commit into from
Closed

[10.0][MIG] mgmtsystem_nonconformity_project #191

wants to merge 1 commit into from

Conversation

thinkwelltwd
Copy link

@thinkwelltwd thinkwelltwd commented Jul 4, 2017

#159

This is the real version that I wanted. #190 was just to get moved up to v10. I know you'll complain that this PR wasn't following the technical and I didn't.

But #190 isn't merged. And I tried branching off of my local copy of that branch to create v10, and that pulled in years of commits, like has been the bane of my contributions in project. I tried a modified version of technical:

git format-patch --stdout upstream/10.0..origin/9.0-migrate-mgmsystem_nonconformity_project -- $MODULE | git am -3

And that generates no changes. I would very much like to help migrate OCA modules, and I'd like to follow the workflow that the docs require. But I never have been able to create a v10 PR that actually was correct and only included my commits.

This is doubtless my fault, but just as certainly, it's an odd workflow to have 8,9,10 branches, all containing v8 code, and where v10 code is desired, yet v9 must be done first, yet where v9 and v10 have no continuity.

I understand that it makes modules much more discoverable to have all branches include all modules. But it terms of workflow, well, let's say that it's beyond annoying.

I know you can't help everyone..but is there something you can do other than tell me to follow the directions, which I'm already well enough aware of? My email address is in the README.rst; I'd be happy to buy some coffee & donuts to someone who'll get me through this merge mess.

@dreispt
Copy link
Sponsor Member

dreispt commented Aug 16, 2017

The current migration strategy was designed to make simple the most common use case: migrating a module from the previous version to the current one, that had no later changes added to it.

In this case, you were able to start migrating a 8.0 module just by making it installable and making the needed changes, without any complicated git magic.
Not that the 9.0 PR is waiting on your feedback.

It's more efficient to have the 9.0 PR finished and merged before making the 10.0 - it will save you from repeating fixes. But nothing prevents you from working on the 10.0 at the same time.
The create the 10.0 port, you can branch from 10.0 and the git cherry-pick the commits with your 9.0 changes.

@max3903 max3903 added this to the 10.0 milestone Apr 2, 2018
If you spotted it first, help us smashing it by providing a detailed and welcomed feedback `here <https://github.com/OCA/
Management-system/issues/new?body=module:%20
mgmtsystem_nonconformity_project%0Aversion:%20
9.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
9.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
10.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.

{
"name": "Management System - Project",
"version": "1.0",
"version": "10.0.1.0.0",
"author": "Savoir-faire Linux,Odoo Community Association (OCA)",
"website": "http://www.savoirfairelinux.com",
Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"website": "http://www.savoirfairelinux.com",
"website": "https://github.com/OCA/management-system",

<field name="model">mgmtsystem.action</field>
<field name="inherit_id" ref="mgmtsystem_action.view_mgmtsystem_action_tree"/>
<field name="arch" type="xml">

Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change

<field name="action_type"/>
<field name="complete_name"/>
</field>

Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change

<field name="model">mgmtsystem.action</field>
<field name="inherit_id" ref="mgmtsystem_action.view_mgmtsystem_action_form"/>
<field name="arch" type="xml">

Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change

<field name="name" position="replace">
<field name="action_type"/>
</field>

Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change

<field name="project_id" colspan="4"
attrs="{'invisible' : [('action_type', '!=', 'project')]}"/>
</field>

Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants