Skip to Content
  2. Mailing Lists
  3. Contributors
  4. Re: 13.0 Migration instructions

Archives

Contributors

Re: 13.0 Migration instructions

Re: 13.0 Migration instructions

Re: 13.0 Migration instructions

To keep in mind, we are talking only about administrative commits that were created due to the previous commit.

We should only squash commits if it was clearly identified after a "real" commit and in clear relation with that commit by the ocabot or a maintainer.


Because for translation commits when migrating to 12.0 we squashed all in one for updates from Transifex.
In this case it's not relevant to squash them to the previous commit.
It could add big noise to a simple fix commit of 2 lines that doesn't affect the translation terms.

Regards,
Yannick Vaucher
Business Solutions Architect

Camptocamp SA
PSE A, CH-1015 Lausanne
Phone: +41 21 619 10 30
Office: +41 21 619 10 10


On Mon, 30 Sep 2019 at 15:07, Pedro M. Baeza (Tecnativa) <pedro.baeza@tecnativa.com> wrote:
The idea is to merge them with the first "real commit".

Imagine this commit history (from more recent to older):

[UPD] README.rst
Update translation files
[MIG] xxxx: Migration to version 12.0

Squashing all of them with the migration commit doesn't lose the commit history meaning.

Regards.

_______________________________________________
Mailing-List: https://odoo-community.org/groups/contributors-15
Post to: mailto:contributors@odoo-community.org
Unsubscribe: https://odoo-community.org/groups?unsubscribe

by Yannick Payot - 02:31 - 4 Oct 2019

Reference

  • 13.0 Migration instructions
    Dear community,

    In https://github.com/OCA/maintainer-tools/wiki/Migration-to-version-13.0 there’s “Squash administrative commits (if any) with the previous commit for reducing commit noise.”
    It should be understood as “Squash with previous administrative commits” or “Squash with any previous commit”?

    Kind regards,
    Alexey
    by Alexey Pelykh <alexey.pelykh@gmail.com> - 12:41 - 30 Sep 2019

    3 replies 3 replies

    • Re: 13.0 Migration instructions
      Yeah, thanks for the clarification.

      And now even with translations, the commit is done with GitHub login of each translator, so we shouldn't squash them together (unless same author) for preserving authorship.

      Regards.
      by Pedro M. Baeza - 02:41 - 4 Oct 2019
    • Re: 13.0 Migration instructions
      To keep in mind, we are talking only about administrative commits that were created due to the previous commit.

      We should only squash commits if it was clearly identified after a "real" commit and in clear relation with that commit by the ocabot or a maintainer.


      Because for translation commits when migrating to 12.0 we squashed all in one for updates from Transifex.
      In this case it's not relevant to squash them to the previous commit.
      It could add big noise to a simple fix commit of 2 lines that doesn't affect the translation terms.

      Regards,
      Yannick Vaucher
      Business Solutions Architect

      Camptocamp SA
      PSE A, CH-1015 Lausanne
      Phone: +41 21 619 10 30
      Office: +41 21 619 10 10


      On Mon, 30 Sep 2019 at 15:07, Pedro M. Baeza (Tecnativa) <pedro.baeza@tecnativa.com> wrote:
      The idea is to merge them with the first "real commit".

      Imagine this commit history (from more recent to older):

      [UPD] README.rst
      Update translation files
      [MIG] xxxx: Migration to version 12.0

      Squashing all of them with the migration commit doesn't lose the commit history meaning.

      Regards.

      _______________________________________________
      Mailing-List: https://odoo-community.org/groups/contributors-15
      Post to: mailto:contributors@odoo-community.org
      Unsubscribe: https://odoo-community.org/groups?unsubscribe

      by Yannick Payot - 02:31 - 4 Oct 2019
    • Re: 13.0 Migration instructions
      The idea is to merge them with the first "real commit".

      Imagine this commit history (from more recent to older):

      [UPD] README.rst
      Update translation files
      [MIG] xxxx: Migration to version 12.0

      Squashing all of them with the migration commit doesn't lose the commit history meaning.

      Regards.
      by Pedro M. Baeza - 03:06 - 30 Sep 2019