Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
erp5
erp5
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Merge Requests 110
    • Merge Requests 110
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Jobs
  • Commits
  • nexedi
  • erp5erp5
  • Merge Requests
  • !832

Closed
Opened Feb 12, 2019 by Ayush Tiwari@tiwariayush1 of 2 tasks completed1/2 tasks
  • Report abuse
Report abuse

ERP5VCS: Add support for submodules

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 (f75b7c3b)

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/)

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch https://lab.nexedi.com/tiwariayush/erp5.git submodule_support
git checkout -b tiwariayush/erp5-submodule_support FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout origin/master
git merge --no-ff tiwariayush/erp5-submodule_support

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

  • Discussion 4
  • Commits 3
  • Changes 12
Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: nexedi/erp5!832
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备14008524号