Yes, you could have a local branch, cherry pick all the changes that you know are working plus the last one that causes issues. Then you can send the whole branch for review, which will open a new review for each of the changes and then submit them manually.
Cheers, Lars On Fri, Mar 15, 2019 at 6:09 PM Quanlong Huang <huangquanl...@gmail.com> wrote: > I thought all the submits to 2.x and master branch should be done in > Gerrit. Do you mean I can create a new branch manually with the next 10 > patches, and then merge it *manually* to branch 2.x after > parallel-all-tests run successfully on it? > > -- > Quanlong > > On Sat, Mar 16, 2019 at 12:17 AM Lars Volker <l...@cloudera.com> wrote: > > > The Jenkins job uses compare_branches.py > > <https://github.com/apache/impala/blob/2.x/bin/compare_branches.py> to > do > > the cherry picking. That script takes source_branch and target_branch > > parameters, but they need to be valid keys into the ignored commits file. > > You'd probably want to amend that script to take a commit up until which > > you want to pick. Alternatively you could do the picking manually by > > passing a list of the commits from your spreadsheet into "git commit" (it > > can handle multiple commits at once). Then just run parallel-all-tests on > > it. > > > > Let me know if you need help with triggering any of this. > > > > Cheers, Lars > > > > On Fri, Mar 15, 2019 at 8:37 AM Quanlong Huang <huangquanl...@gmail.com> > > wrote: > > > > > Hi all, > > > > > > Branch 2.x is now at 193a1b5. See more details: > > > > > > > > > https://docs.google.com/spreadsheets/d/12h1rTAPS1gm0vhlDGxeOXjnRD7rrOcoqzX4rjRRCyBg > > > > > > I got a trouble that the cherrypick-2.x-and-test job is able to cleanly > > > pick the next 15 patches but build fail due to a patch in the middle > > > (f16436628). It needs some changes to fix the test. But I can't submit > > the > > > new patch until branch 2.x has picked the patch before it. > > > > > > Is it possible to add a parameter in job cherrypick-2.x-and-test, to > tell > > > it that don't consider patches after a commit? So I can let > > > cherrypick-2.x-and-test > > > pick only the next 10 patches and submit a new patch for the fix later. > > > > > > Thanks, > > > Quanlong > > > > > >
