| commit | 57d09a2facb6a464723aeb23dd0e9fe9a038f898 | [log] [tgz] |
|---|---|---|
| author | Dave Borowitz <dborowitz@google.com> | Tue Feb 09 09:45:57 2016 -0500 |
| committer | Dave Borowitz <dborowitz@google.com> | Tue Feb 09 19:00:38 2016 -0500 |
| tree | c902a4412ebb517efa9126f78c201edc3c27eaef | |
| parent | 0502b8a9861b735302a0965f0700f7025841af2e [diff] |
Don't reuse ALREADY_MERGED for an identical tree ALREADY_MERGED now means the change is already reachable from the branch tip. This is different from the case where we catch MergeIdenticalTreeException, which indicates the change was marked as merged despite not actually appearing in the commit history. Distinguish between these cases by using a newer, more descriptive CommitMergeStatus. Add a test for this case, fixing an IllegalStateException found in the process. Change-Id: I842e579d12ce745b2bc84dfd93a9f5b7213c71a8
Gerrit is a code review and project management tool for Git based projects.
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.
For information about how to install and use Gerrit, refer to the documentation.
Our canonical Git repository is located on googlesource.com. There is a mirror of the repository on Github.
Please report bugs on the issue tracker.
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.
The IRC channel on freenode is #gerrit. An archive is available at: echelog.com.
The Developer Mailing list is repo-discuss on Google Groups.
Gerrit is provided under the Apache License 2.0.
Install Buck and run the following:
git clone --recursive https://gerrit.googlesource.com/gerrit
cd gerrit && buck build release
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>]
NOTE: release is optional. Last released package of the version is installed if the release number is omitted.