Update policy for the current state of DPMT
All threads resolved!
All threads resolved!
Merge request reports
Activity
- Resolved by Yao Wei (魏銘廷)
77 72 Git Procedures 78 73 ============== 79 74 80 As of October 9, 2015, the DPMT uses git as the version control system for all 81 packages, and git-dpm as the patch management regime. 75 At the time of writing, the DPMT uses ``git-buildpackage`` to maintain the 76 packaging, which inherently uses Git for version control. 77 78 Previous DPMT policy requires ``git-dpm`` to manage patches as well as 79 packaging. However, we reverted the choice and use ``quilt`` to manage the 80 patches, while using compatible tools like ``gbp pq`` is allowed, as long as 81 compatibility to ``quilt (3.0)`` format is retained. changed this line in version 2 of the diff
added 2 commits
added 1 commit
- 4e751196 - updating branch policy from wiki, and suggest a policy about MR
added 12 commits
-
4e751196...79669e4c - 5 commits from branch
python-team/tools:master
- 27211750 - update policy for current practice
- b6572c1d - fix some wording
- 1090eaf4 - add paragraph about configurations
- 42a88be3 - wording change
- 1f26c780 - whitespace fix
- 16cf927d - use branch name documented in the wiki
- 24a322f4 - updating branch policy from wiki, and suggest a policy about MR
Toggle commit list-
4e751196...79669e4c - 5 commits from branch
can you split this MR to these parts please:
- cosmetic changes (git -> Git)
- git-dpm -> gbp
- usage of quilt + gbp pq
- DEP-14 branches
(in this order)
Edited by Ondřej NovýI found myself in a situation that if the MR depends on my MR, I cannot split it well. Hence, when you merge the latter MR, the previous MRs will also get merged.
It is still a feature request in GitLab: https://gitlab.com/gitlab-org/gitlab-ce/issues/14232
Edited by Yao Wei (魏銘廷)
Please register or sign in to reply