Changes between Version 79 and Version 80 of DevWikiComitGuidelines


Ignore:
Timestamp:
Feb 19, 2022, 3:07:18 PM (2 years ago)
Author:
robe
Comment:

—

Legend:

Unmodified
Added
Removed
Modified

  • DevWikiComitGuidelines

    v79 v80  
    1313
    1414== Election to Core Contributors Group ==
    15 Permission for write source tree access shall be provided to contributors only if accepted by the PostGIS Project Steering Committee. A proposal should be written to the PSC for new contributors and voted on normally. It is not necessary to write an RFC document for these votes, a proposal to postgis-dev is sufficient. After approval, the approved contributor shall be given write access to the PostGIS source repo and also added to the documentation under the section [https://postgis.net/docs/manual-dev/postgis_introduction.html#credits_core_present Core Contributors Present]
     15Permission for write source tree access to our primary repo (https://git.osgeo.org/gitea/postgis/postgis.git) shall be provided to contributors only if accepted by the PostGIS Project Steering Committee. A proposal should be written to the PSC for new contributors and voted on normally. It is not necessary to write an RFC document for these votes, a proposal to postgis-dev is sufficient. After approval, the approved contributor shall be given write access to the PostGIS source repo and also added to the documentation under the section [https://postgis.net/docs/manual-dev/postgis_introduction.html#credits_core_present Core Contributors Present]
    1616
    1717Removal of write access should be handled by the same process.
    … …  
    4646       For small changes where there is no ticket and there is a pull request or patch, reference to these e.g. github/gitlab/gitea pull request link is sufficient
    4747    3. If you are given a patch or pull request from a community person, note their name in both the commit log entry and NEWS file.
    48     4. To close a ticket or pull request you can add to your commit log  Closes #[xyz]  where xyx is the trac ticket, or  Closes [link to pull request].  Our trac system has a hook to automatically close these on trac and our git mirrors.
     48    4. To close a ticket or pull request you can add to your commit log  Closes #[xyz]  where xyx is the trac ticket, or  Closes [link to pull request].  Our trac system has a hook to automatically close these on trac and our git mirrors. *DO NOT USE THE MERGE BUTTON* on pull requests.
     49       Do instead to merge changes into your local git and then push to our primary repo. This can be done using git merge or using the git patch link of the pull request (on all systems it's the git pull url with .patch or .diff at the end) and applying the patch.
     50   
    4951    5. Similarly adding References #[xyz] or References [link to pull request] will automatically put the commit log notes on the trac ticket/git pull request. If you forget to add the notes to the commit log, edit the trac ticket/git pull request and put the notes in - After committing changes related to a ticket in Trac, write the tree and revision in which it was fixed in the ticket description. Such as "Fixed in master ..git hash and in branches/3.0 <githas>". The 'r' character enables Trac to create a hyperlink from the ticket to the changeset.
    5052    6. When new enhancements are added or breaking changes are made and completed the related ticket should be added to the NEWS file.