Skip to content

Remove resultlog from the docs #13465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 2, 2025
Merged

Remove resultlog from the docs #13465

merged 1 commit into from
Jun 2, 2025

Conversation

nicoddemus
Copy link
Member

It was removed by d69abff in version 6.1.0.

Fixes #13464

It was removed by d69abff in version `6.1.0`.

Fixes #13464
@nicoddemus nicoddemus added skip news used on prs to opt out of the changelog requirement backport 8.3.x labels Jun 2, 2025
@nicoddemus nicoddemus enabled auto-merge (squash) June 2, 2025 12:32
@nicoddemus nicoddemus merged commit e4389ac into main Jun 2, 2025
31 checks passed
@nicoddemus nicoddemus deleted the docs-resultlog branch June 2, 2025 12:53
Copy link

patchback bot commented Jun 2, 2025

Backport to 8.3.x: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply e4389ac on top of patchback/backports/8.3.x/e4389acb4d650f349a728cc42067d8c1a246bdcb/pr-13465

Backporting merged PR #13465 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/pytest-dev/pytest.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/8.3.x/e4389acb4d650f349a728cc42067d8c1a246bdcb/pr-13465 upstream/8.3.x
  4. Now, cherry-pick PR Remove resultlog from the docs #13465 contents into that branch:
    $ git cherry-pick -x e4389acb4d650f349a728cc42067d8c1a246bdcb
    If it'll yell at you with something like fatal: Commit e4389acb4d650f349a728cc42067d8c1a246bdcb is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x e4389acb4d650f349a728cc42067d8c1a246bdcb
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Remove resultlog from the docs #13465 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/8.3.x/e4389acb4d650f349a728cc42067d8c1a246bdcb/pr-13465
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@nicoddemus
Copy link
Member Author

nicoddemus commented Jun 2, 2025

I won't bother with the backport given the 8.4 release is emminent.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
skip news used on prs to opt out of the changelog requirement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Documentation still states --resultlog is “planned for removal in 6.0” despite already being removed
3 participants