126af24dd5
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