Details
-
Bug
-
Resolution: Unresolved
-
P3: Somewhat important
-
None
-
master
-
None
Description
when you have a series of changes and subsequent changes have a physical dependency on the former changes, they will be shown as having a merge conflict. that's bad enough (it's just stupid that the dependencies are not considered; i presume that this is an overly pedantic interpretation of the cherry-pick submit strategy), but it gets really annoying due to the fact that the mergability is not re-checked when the parent is submitted. that way you end up with changes which are approved, yet cannot be submitted. the workaround is to add another score (e.g., a pointless sanity review).
dunno if this manifests when CI is enabled; i've only observed it without CI so far, because nowadays i work mostly with qtrepotools.
this might actually be an upstream bug, and it might be already fixed - we're again lagging quite some patch levels and one minor release (very soon two).