1. Forum
  2. USENET
  3. muc.lists.freebsd.ports

  • Can committers merge pull requests for ports ?

    From Yuri@yuri@FreeBSD.org to muc.lists.freebsd.ports on Tue Sep 8 01:30:06 2026
    From Newsgroup: muc.lists.freebsd.ports

    Somehow the merge button is disabled for me.



    Yuri



    --
    Posted automagically by a mail2news gateway at muc.de e.V.
    Please direct questions, flames, donations, etc. to news-admin@muc.de
    --- Synchronet 3.22a-Linux NewsLink 1.2
  • From Gleb Popov@arrowd@freebsd.org to muc.lists.freebsd.ports on Tue Sep 8 12:09:11 2026
    From Newsgroup: muc.lists.freebsd.ports

    On Tue, Sep 8, 2026 at 11:30rC>AM Yuri <yuri@freebsd.org> wrote:

    Somehow the merge button is disabled for me.

    If you're talking about https://github.com/freebsd/freebsd-ports then
    the answer is no.
    The proper way to land a PR currently is:
    1. Check out the PR branch. I'm using
    gh pr checkout https://github.com/freebsd/freebsd-ports/pull/123
    for this. The `gh` command comes from `devel/gh`.
    2. Rebase onto main
    3. Amend commits to have
    Pull request: https://github.com/freebsd/freebsd-ports/pull/123
    in the commit's description
    4. git switch main && git merge <PR branch>
    5. git push
    6. Close the PR manually.
    --
    Posted automagically by a mail2news gateway at muc.de e.V.
    Please direct questions, flames, donations, etc. to news-admin@muc.de
    --- Synchronet 3.22a-Linux NewsLink 1.2
  • From Gleb Popov@arrowd@freebsd.org to muc.lists.freebsd.ports on Tue Sep 8 13:21:27 2026
    From Newsgroup: muc.lists.freebsd.ports

    On Tue, Sep 8, 2026 at 1:15rC>PM Robert Clausecker <fuz@fuz.ooo> wrote:

    Hi Yuri,

    On Tue, Sep 08, 2026 at 01:30:06AM -0700, Yuri wrote:
    Somehow the merge button is disabled for me.

    Yuri

    Please mark the commit you land the pull request with with the
    appropriate rCLPull-Request.rCY tag as per committer's guide. Then
    close the pull request.
    Right now the guide spells the tag with space [1]. The same form is used
    in the .hooks/prepare-commit-msg file.
    I remember talks about switching to the "foo-bar" scheme due to git idiosyncrasies.
    Did we actually decide to switch?
    [1] https://docs.freebsd.org/en/articles/committers-guide/#github-pull-land
    --
    Posted automagically by a mail2news gateway at muc.de e.V.
    Please direct questions, flames, donations, etc. to news-admin@muc.de
    --- Synchronet 3.22a-Linux NewsLink 1.2
  • From Pat Maddox@pat@patmaddox.com to muc.lists.freebsd.ports on Wed Sep 9 13:42:14 2026
    From Newsgroup: muc.lists.freebsd.ports

    On Tue, Sep 8, 2026, at 2:09 AM, Gleb Popov wrote:
    On Tue, Sep 8, 2026 at 11:30rC>AM Yuri <yuri@freebsd.org> wrote:

    Somehow the merge button is disabled for me.


    If you're talking about https://github.com/freebsd/freebsd-ports then
    the answer is no.
    The proper way to land a PR currently is:
    1. Check out the PR branch. I'm using

    gh pr checkout https://github.com/freebsd/freebsd-ports/pull/123

    for this. The `gh` command comes from `devel/gh`.

    2. Rebase onto main
    3. Amend commits to have

    Pull request: https://github.com/freebsd/freebsd-ports/pull/123

    in the commit's description
    4. git switch main && git merge <PR branch>
    5. git push
    6. Close the PR manually.
    FYI you can use this trailer:
    Closes: https://github.com/freebsd/freebsd-ports/pull/123
    and it will automatically close the PR. That is probably only desirable for single-commit PRs though.
    Pat
    --
    Posted automagically by a mail2news gateway at muc.de e.V.
    Please direct questions, flames, donations, etc. to news-admin@muc.de
    --- Synchronet 3.22a-Linux NewsLink 1.2