Google Git
Sign in
gerrit / gerrit / 3b413fda3697ca6302eef5fbe0a72d868ebb7099
commit3b413fda3697ca6302eef5fbe0a72d868ebb7099[log] [tgz]
authorYash Chaturvedi <yash.chaturvedi@linaro.org>Wed Sep 11 11:17:55 2024 +0530
committerYash Chaturvedi <yash.chaturvedi@linaro.org>Wed Sep 11 12:36:35 2024 +0530
treeaf66fb3a551d8c096383176e6b3f3a80a69ba00a
parente30bf2bb7f258d15e5953b2f4d26238734f00abe [diff]
Set change status to WIP if cherry-pick results in conflicts

In cases when cherry-pick operation results in a new PS on an existing
change and has conflicts, the change should be marked as WorkInProgress.

Also change the status to WIP if source change is in WIP and remove the
redundant `shouldSetToReady` method introduced in the change 305722.
Since, the test introduced in the change passes with the replacement
logic, it can be assumed we're not limiting the existing behaviour.

Release-Notes: Set change status to WIP for cases when cherry-pick results in a new PS and has conflicts
Change-Id: I1be7f5f065f9bf98cbdad7e8b91a60cd2983c521
2 files changed
tree: af66fb3a551d8c096383176e6b3f3a80a69ba00a
  1. .github/
  2. .settings/
  3. .ts-out/
  4. antlr3/
  5. contrib/
  6. Documentation/
  7. e2e-tests/
  8. java/
  9. javatests/
  10. lib/
  11. modules/
  12. plugins/
  13. polygerrit-ui/
  14. prolog/
  15. prologtests/
  16. proto/
  17. resources/
  18. tools/
  19. webapp/
  20. polymer-bridges
  21. .bazelignore
  22. .bazelproject
  23. .bazelrc
  24. .bazelversion
  25. .editorconfig
  26. .git-blame-ignore-revs
  27. .gitignore
  28. .gitmodules
  29. .gitreview
  30. .mailmap
  31. .pydevproject
  32. .zuul.yaml
  33. BUILD
  34. COPYING
  35. INSTALL
  36. Jenkinsfile
  37. MODULE.bazel
  38. package.json
  39. README.md
  40. SUBMITTING_PATCHES
  41. version.bzl
  42. web-dev-server.config.mjs
  43. WORKSPACE
  44. yarn.lock
README.md

Gerrit Code Review

Gerrit is a code review and project management tool for Git based projects.

Build Status Maven Central

Objective

Gerrit makes reviews easier by showing changes in a side-by-side display, and allowing inline comments to be added by any reviewer.

Gerrit simplifies Git based project maintainership by permitting any authorized user to submit changes to the master Git repository, rather than requiring all approved changes to be merged in by hand by the project maintainer.

Documentation

For information about how to install and use Gerrit, refer to the documentation.

Source

Our canonical Git repository is located on googlesource.com. There is a mirror of the repository on Github.

Reporting bugs

Please report bugs on the issue tracker.

Contribute

Gerrit is the work of hundreds of contributors. We appreciate your help!

Please read the contribution guidelines.

Note that we do not accept Pull Requests via the Github mirror.

Getting in contact

The Developer Mailing list is repo-discuss on Google Groups.

License

Gerrit is provided under the Apache License 2.0.

Build

Install Bazel and run the following:

    git clone --recurse-submodules https://gerrit.googlesource.com/gerrit
    cd gerrit && bazel build release

Install binary packages (Deb/Rpm)

The instruction how to configure GerritForge/BinTray repositories is here

On Debian/Ubuntu run:

    apt-get update && apt-get install gerrit=<version>-<release>

NOTE: release is a counter that starts with 1 and indicates the number of packages that have been released with the same version of the software.

On CentOS/RedHat run:

    yum clean all && yum install gerrit-<version>[-<release>]

On Fedora run:

    dnf clean all && dnf install gerrit-<version>[-<release>]

Use pre-built Gerrit images on Docker

Docker images of Gerrit are available on DockerHub

To run a CentOS 8 based Gerrit image:

    docker run -p 8080:8080 gerritcodereview/gerrit[:version]-centos8

To run a Ubuntu 20.04 based Gerrit image:

    docker run -p 8080:8080 gerritcodereview/gerrit[:version]-ubuntu20

NOTE: release is optional. Last released package of the version is installed if the release number is omitted.