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
  • !2138

merge wendelin.git to erp5.git

  • Review changes

  • Download
  • Patches
  • Plain diff
Merged Xiaowu Zhang requested to merge xiaowu.zhang/erp5:merge_wendelin into master Jul 21, 2025
  • Overview 18
  • Commits 946
  • Pipelines 0
  • Changes 465+

After discussion of https://lab.nexedi.com/nexedi/slapos/-/merge_requests/1822#note_239092, it seems we need to move wendelin.git to erp5.git to be more consistent

Related MRs: https://lab.nexedi.com/nexedi/slapos/-/merge_requests/1859, https://lab.nexedi.com/nexedi/wendelin/-/merge_requests/183

here are the changes for

wendelin.git:

  1. wendelin/bt5/* is moved to erp5/bt5/*, with commit history

  2. wendelin/tutorial, wendelin/utils, wendelin/CHANGES.md, wendelin/README.md are moved to erp5/wendelin with commit history

  3. wendelin/product/Wendelin/__init__.py is merged to erp5/product/ERP5Type/patches/Restricted.py

  4. wendelin/scalability_test/example is moved to erp5/scalability_test/example_wendelin with commit history

  5. wendelin/scalability_test/cluster_configuration_template.json is moved to erp5/scalability_test/cluster_configuration_template_wendelin.json with commit history

  6. wendelin/scalability_test/__init__.py is merged to erp5/scalability_test/__init__.py

  7. wendelin/tests/__init__.py is merged to erp5/tests/__init__.py

others files are dropped

erp5.git:

Beside the changes of above, testGC is adjusted, please check https://lab.nexedi.com/nexedi/erp5/-/merge_requests/2117#note_238776 for more informations

Edited Jul 29, 2025 by Xiaowu Zhang
Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: merge_wendelin
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7