| commit | 126af24dd5db9bb5588e5c34b10ab4608c5f8da2 | [log] [tgz] |
|---|---|---|
| author | Alexandre Philbert <alexandre.philbert@ericsson.com> | Thu Jan 28 16:12:26 2016 -0500 |
| committer | David Pursehouse <david.pursehouse@sonymobile.com> | Fri Feb 26 16:32:07 2016 +0900 |
| tree | 4173567001d784190d0b8e554bcaf1ac1cb03df0 | |
| parent | 09800bdda7964c4423bffcac60baaf530a2e8dc0 [diff] |
Fix submittabilty of merge commits that resolve conflicts Since I41c3c4 [1], problemsForSubmittingChanges() is called for the case of a merge commit. Beforehand, it was only called for topics. That change caused the submit button to be greyed out as soon as one change in the ChangeSet was not mergeable. The issue with that logic was that merge commits who resolved conflicts at the end of a chain of changes were considered not mergeable. We now check if the patch set is mergeable as a whole, taking into account whether or not there is a resolving merge. Tests are written according to the setup proposed in [2] and another test case proposed in this change's comments [3]. [1] https://gerrit-review.googlesource.com/#/c/69745/14 [2] https://groups.google.com/forum/#!msg/repo-discuss/g1cpsRgs2bo/fnrt9vkcDwAJ [3] https://gerrit-review.googlesource.com/#/c/74461/ Bug: Issue 3811 Change-Id: I30f2f8a8eb573135d98ad5c65ed5b63cb1db5f4b
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.