commit | 9775399ea27b1e0687a357a20eded6f64e48c7e8 | [log] [tgz] |
---|---|---|
author | Sven Selberg <svense@axis.com> | Thu May 12 09:55:30 2016 +0200 |
committer | David Pursehouse <dpursehouse@collab.net> | Wed Jul 06 10:40:56 2016 +0900 |
tree | 6ea2ae9a29f2f122c7526d82fcac75cafba041bc | |
parent | f79ac18f2015fbba1e1f5a3b17668a6081fc1783 [diff] |
Fix %base option and "Create a new change for..." setting Check if the pre-existing ref is a PatchSet of a change with a different target branch than current push if newChangeForAllNotInTarget == true or %base option is set and create a new change for the new target. Don't add the commits about to get merged to alreadyAccepted. Else if a commit C is merged into branch A and you upload a new change with the same commit to branch B, with the %base option or if "Create a new change for every commit not in the target branch:" is configured for the project, MergeOp will merge the commit into branch B, but MergeUtil will not mark the status as "CLEAN_MERGE". The result is that you get a "Change is new" error message, and in order to merge the change you will need to upload a new PatchSet and merge that on top of commit C. Bug: Issue 3426 Change-Id: I01f4b9b04f1797d403671b27b8c2e61d1fd3bcc6
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.