commit | c235ba7e51acb8839ff33c9a7f4932a6808b3414 | [log] [tgz] |
---|---|---|
author | Edwin Kempin <ekempin@google.com> | Wed Sep 14 17:12:06 2016 +0200 |
committer | Edwin Kempin <ekempin@google.com> | Wed Sep 28 11:12:02 2016 +0200 |
tree | 151fd3d8fe13947d1b15de730372de209849fe1d | |
parent | 1a865ce7fd77603a67f1dab3a66917011ef23c57 [diff] |
ChangeScreen: Keep 'Auto Merge' selected when navigating to diff and back If the user preference 'Default Base For Merges' is set to 'First Parent' then the change screen pre-selects the first parent in the 'Diff Against' drop-down list when no base was specified in the URL. This is what we want, but if the user selects 'Auto Merge' now and navigates to a diff and then back to the change screen, by clicking on the up arrow in the diff screen, then it's expected that 'Auto Merge' is still selected. However in this case the change screen switches back to the first parent. This is because 'Auto Merge' has no representation in the URL and we cannot differentiate between no base selected and 'Auto Merge' selected. To fix this represent patch set n against 'Auto Merge' in the URL as 'AutoMerge..n'. Do this only if the user preference 'Default Base For Merges' is set to 'First Parent'. If it is set to 'Auto Merge' there is no problem because no base is resolved to 'Auto Merge'. Change-Id: I751f63ac0da7ea46ade4012838672ff052c54d2f Signed-off-by: Edwin Kempin <ekempin@google.com>
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.