Should we add a check to the master GVO that makes sure that a change either applies to 2.x, or has a "not for 2.x" label?
On Thu, May 3, 2018 at 12:12 PM, Sailesh Mukil <[email protected]> wrote: > It's been a while since we started maintaining 2 active branches, master > and 2.x, and the divergence between them has grown quite a bit. > > The implications of this (as Michael Brown brought to my attention) are > that a patch that goes into 'master' may not cleanly apply to '2.x', which > would fail the cherrypick-2.x-and-test( > https://jenkins.impala.io/job/cherrypick-2.x-and-test/) job, and if > unnoticed, can hold up all future cherry-picks from 'master' to '2.x' until > this is resolved. > > If this does happen, the original author of the patch needs to manually > cherry-pick the patch from 'master' to '2.x', resolve the conflicts and > push a change for review to the '2.x' branch with the same Change-Id. > > To avoid these types of failures, I advise authors to locally cherry pick > their patch to '2.x' to see if it applies cleanly before running GVO. > > Lastly, if a patch is meant only for 'master', and not for '2.x', please > remember to add the "Cherry-picks: not for 2.x" line to your commit > message. There have been a few patches in which this was not included, > which unfortunately requires manual work to resolve later on. > > Thank you for your time! > > - Sailesh >
