diff options
| author | Sven Selberg <svense@axis.com> | 2016-11-15 11:25:16 +0100 |
|---|---|---|
| committer | David Pursehouse <dpursehouse@collab.net> | 2016-11-16 11:21:24 -0800 |
| commit | 29445062ad2755a0806985073050423e5e75850f (patch) | |
| tree | 11c3fbb753df75a28b8734365baa8b94387e6d30 /gerrit-plugin-js-archetype/pom.xml | |
| parent | df0145d52fee1ca9e9cf8c95bfc579eb5f33cef2 (diff) | |
Allow submit of merge of non change branch
Commit a61b6eed5337049a7feb58ac935543624f107129 introduced a bug that
prevents mergeing of a branch that is not a change.
It marks the branch to be merged into as uninteresting whereas the
branch that gets merged is not, which causes Gerrit to think that it
is not allowed to merge it resulting in MISSING_DEPENDENCIES error.
In the case where the walk hits a commit that does not have canMergeFlag
and is not in the commits to be submitted, check if commit is already
merged.
Bug: Issue 4930
Change-Id: Ib4f95ebe336e381d6fcbf36867e84d927ac13eb1
Diffstat (limited to 'gerrit-plugin-js-archetype/pom.xml')
0 files changed, 0 insertions, 0 deletions