Repository navigation
[ADD] oca-create-branch-from-previous - #663
Merged
Merged
Conversation
Contributor
|
@sbidoul to close or to merge? |
sbidoul
force-pushed
the
create-branch-sbi
branch
from
August 5, 2026 14:02
2e62de4 to
e564c96
Compare
Member
Author
|
@simahawk I think it worked well. So merge. I would love to have this supported by repo-maintainer-conf before preparing the 20.0 branches. |
Contributor
You mean by having a flag like |
Contributor
|
@sbidoul let's move the discussion on OCA/repo-maintainer#26 |
simahawk
added a commit
to simahawk/repo-maintainer
that referenced
this pull request
Sep 14, 2026
Closes OCA#26 When creating a branch that doesn't exist yet, oca-repo-manage always started it from an empty tree (just the copier template applied). This adds an opt-in `new_branch_not_empty` boolean flag on a repo's conf: when set, the new branch is instead created from the content of the closest existing branch with a lower version (falling back to the repo's default branch when none is found), with the copier template re-applied for the new Odoo version and all addons marked `installable = False`, so maintainers port modules one by one instead of starting from scratch. The manifest-rewriting helper is adapted from the equivalent one added to OCA/maintainer-tools in OCA/maintainer-tools#663, reimplemented locally rather than added as a dependency (see comment in oca_repo_maintainer/tools/manifest.py for why).
simahawk
added a commit
to simahawk/repo-maintainer
that referenced
this pull request
Sep 14, 2026
Closes OCA#26 When creating a branch that doesn't exist yet, oca-repo-manage always started it from an empty tree (just the copier template applied). This adds an opt-in `new_branch_not_empty` boolean flag on a repo's conf: when set, the new branch is instead created from the content of the closest existing branch with a lower version (falling back to the repo's default branch when none is found), with the copier template re-applied for the new Odoo version and all addons marked `installable = False`, so maintainers port modules one by one instead of starting from scratch. The manifest-rewriting helper is adapted from the equivalent one added to OCA/maintainer-tools in OCA/maintainer-tools#663, reimplemented locally rather than added as a dependency (see comment in oca_repo_maintainer/tools/manifest.py for why).
simahawk
added a commit
to simahawk/repo-maintainer
that referenced
this pull request
Sep 14, 2026
Closes OCA#26 When creating a branch that doesn't exist yet, oca-repo-manage always started it from an empty tree (just the copier template applied). This adds an opt-in `new_branch_not_empty` boolean flag on a repo's conf: when set, the new branch is instead created from the content of the closest existing branch with a lower version (falling back to the repo's default branch when none is found), with the copier template re-applied for the new Odoo version and all addons marked `installable = False`, so maintainers port modules one by one instead of starting from scratch. The manifest-rewriting helper is adapted from the equivalent one added to OCA/maintainer-tools in OCA/maintainer-tools#663, reimplemented locally rather than added as a dependency (see comment in oca_repo_maintainer/tools/manifest.py for why).
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Script to create a branch from a previous one, setting all addons installable=False and reapplying the project template.