• Home
    • View
    • Login
    This page
    • Normal
    • Export PDF
    • Page Information

    Loading...
  1. Dashboard
  2. Undefined Space
  3. Skara
  4. Backports

Page History

Versions Compared

Old Version 29

changes.mady.by.user Erik Joelsson

Saved on Aug 14, 2023

compared with

New Version 30

changes.mady.by.user Kevin Rushforth

Saved on Dec 08, 2023

  • Previous Change: Difference between versions 28 and 29
  • Next Change: Difference between versions 30 and 31
  • View Page History

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

The bots will automatically detect if the commit in a backport pull request is a clean backport. If it is then bots will add the label "clean" to the pull requests. There is also a user command /clean, which can be used to manually label a backport as clean. Backport pull requests classified as a clean backport can be integrated without reviewers in some repositories (configurable per repository). This means that not all commit messages for backport commits will have a "Reviewed-by" line. 

...

The /backport commit command and /backport pull request command can be used to quickly create a backport pull request for a given commit. Just navigate to the original commit or pull request in source code hosting provider's web UI and add a comment consisting of /backport <repo> [<branch>]. If the commit does not apply clean cleanly on the target repository then a message will be shown for the files with conflicts.

...

Navigate the to commit intended to be backported in the source code hosting provider's web UI and issue the /backport commit command. If the commit applied cleanly onto the target repository then go to the pull request linked Use the link in the reply and issue the /integrate to create to the pull request command.

If the commit did not apply cleanly then the commit must be backport manually and backport pull request must be created manually. See the CLI section for an example of how to do this using the command-line.

In either of the above cases, once the PR is marked as "ready", issue the /integrate pull request command.

CLI

Use the Skara CLI tool git-backport to try to automatically create a backport pull request for the given commit, for example:

...

If the commit applied cleanly onto the target repository then you can create a pull request and integrate . Once it is marked as "ready", integrate it with git-pr integrate, for example:

...

Overview
Content Tools
ThemeBuilder

Terms of Use
• License: GPLv2
• Privacy • Trademarks • Contact Us

Powered by a free Atlassian Confluence Open Source Project License granted to https://www.atlassian.com/software/views/opensource-community-additional-license-offer. Evaluate Confluence today.

  • Kolekti ThemeBuilder Powered by Atlassian Confluence 8.5.23
  • Kolekti ThemeBuilder printed.by.atlassian.confluence
  • Report a bug
  • Atlassian News
Atlassian
Kolekti ThemeBuilder EngineAtlassian Confluence
{"serverDuration": 323, "requestCorrelationId": "94360646214d30f9"}