Chris found an issue with the way git histories were being handled in the way I merged things, so I have revised the proposed branch: https://github.com/parshimers/incubator-asterixdb/commits/hyracks-merge2
Basically I was trying to fit everything into one commit, because I thought at first that I could submit it to Gerrit that way. However that doesn't work for other reasons, basically Gerrit tries to treat every new commit from Hyracks as a new change. Splitting the commits of the repository merge fixes the issue. @Till, I think that creating a textual patch would just be more work. If I were to do it that way I would try fetching the Gerrit patch, and then cherry-picking it onto a new branch that has the hyracks+asterix master as the head. On Wed, Mar 30, 2016 at 5:42 PM, Till Westmann <ti...@apache.org> wrote: > To get existing patches in, could we just create a textual patch (e.g. > from gerrit), apply that with the necessary -p option to a new local > checkout of the merged repositories and submit a new review to gerrit? > > Thanks, > Till > > On 30 Mar 2016, at 12:36, Ian Maxon wrote: > > > Hi all, > > I went ahead preliminarily merged the Hyracks and AsterixDB repositories > > into one. Unfortunately this can't be reviewed in Gerrit so you all can > > check it out here: > > > https://github.com/parshimers/incubator-asterixdb/tree/imaxon/merge-hyracks > > > > You will likely have to do some ugly rebasing for whatever changes you > > might have open once this gets done, since it moves asterixdb down one > > folder and swaps out pom.xml in the repository root. Hyracks is in a > > similar situation, though you would want to reapply your change to the > > AsterixDB repo from Hyracks (which is a bit odd). If you would like to > see > > how this affects your branch please do try fetching the branch I linked > > above and testing it out on a copy of your topic branch. > > > > I'm still making sure all of the tests pass but nothing's failed so far. > > Unless anyone has objections I think we should push this change either > this > > week or early next week. > > > > Let me know what you all think. > > > > Thanks, > > - Ian >
