| commit | a61b6eed5337049a7feb58ac935543624f107129 | [log] [tgz] |
|---|---|---|
| author | Sven Selberg <svense@axis.com> | Mon Oct 31 11:18:35 2016 +0100 |
| committer | David Pursehouse <dpursehouse@collab.net> | Tue Nov 08 01:37:34 2016 +0000 |
| tree | 06176fe663c3ffdc0e22f981b68d683c630afea6 | |
| parent | 12898f57a678d84530813a4f3c776342d56f1773 [diff] |
Notice merged commits even if they appear on a different branch Backport for stable-2.12 of: Notice merged changes even if they appear on a different branch Idcaec3f0db9e67b8a8390ddd73c0aca95a654b0b Check for merge changes contains an optimization which is overeager: It assumes that all changes that are reachable from any branch are not part of the set of new changes being applied. This speeds up the walk to determine the set of changes to be examined, but produces an incorrect [too small] set. This results in "internal error: change is new" errors when trying to submit a change to one branch that is already part of another branch. For RebaseIfNecessary: Do not mark child of merge candidates as uninteresting If a merge candidate is parent of one of the already accepted refs, the merge candidate will disappear during the sorting in RebaseSorter#sort if it's child is marked as uninteresting. Only mark tip of target branch as uninteresting. Bug: Issue 4158 Inspired-by: Stefan Beller <sbeller@google.com> Change-Id: I483de5bdb2740bb1a7d3dcb71a15865574231647
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.