464af2ad24
The fix in I473ba605decb136cd527308a63f16a5e548697fb did not fully solve the problem with the new Github default merge modes. In case the branch cache already contains the new merge modes, but the tenant project config (TPC) still only supports the old subset of modes, dynamic layout creation will fail saying that the new default merge mode is not supported. To fix this we will supply a new parameter with valid merge modes from the TPC when getting the project default branch instead of getting the project merge modes directly from the branch cache. Based on the list of valid modes the driver can then select the best default merge mode. This change also updates the model API upgrade test v17 -> v18 to cover this case. Change-Id: Ibc5645d4725f0ec31cb7ab18d4500452d866166a |
||
|---|---|---|
| .. | ||
| __init__.py | ||