Skip to content
GitLab
Projects Groups Topics Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
  • Register
  • Sign in
  • erp5 erp5
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributor statistics
    • Graph
    • Compare revisions
  • Merge requests 142
    • Merge requests 142
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Jobs
  • Commits
Collapse sidebar
  • nexedinexedi
  • erp5erp5
  • Merge requests
  • !832

ERP5VCS: Add support for submodules

  • Review changes

  • Download
  • Patches
  • Plain diff
Closed Ayush Tiwari requested to merge tiwariayush/erp5:submodule_support into master Feb 12, 2019
  • Overview 4
  • Commits 3
  • Pipelines 0
  • Changes 12

This MR will help to be able to do basic VCS tasks (commit, diff, merge, etc.) with submodules Business Template in ERP5. This is particularly useful as we are migrating some BT5(s) such as erp5_notebook to act as submodule which are getting large due to data files. We already have support for submodules in slapos gitclone recipe.

This MR can also be used to discuss the naming convention for submodules. As mentioned by @jerome in the comment here , we will be using it for external javascripts also, hence we will be having 2 basic cases. Feel free to add more:

  1. Business Templates as submodule
  2. External Libraries as submodule

TODO:

  • Changes in submodule Business Template should reflect properly in the diff (https://lab.nexedi.com/nexedi/erp5/commit/f75b7c3be1504bf682f4ab8427b2bff8ccabe7c3)

New Issues:

  • Checkout from branch with to without submodule and vice-versa is creating issue. (Use post-checkout hook https://ttboj.wordpress.com/2014/05/06/keeping-git-submodules-in-sync-with-your-branches/)
Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: submodule_support
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7