On Thu, Apr 7, 2016 at 4:34 PM, Grazvydas Ignotas <nota...@gmail.com> wrote: > Hi, > > On Tue, Apr 5, 2016 at 10:30 PM, Jason Ekstrand <ja...@jlekstrand.net> wrote: >> I know we don't usually do merges in this project, but >> the Vulkan driver is big and has a lot of history that we would like to >> preserve. If you're strongly opposed to doing a merge, please speak up now! > > I fear issues like the one in bug 94406 might show up at the merge > point and it will be basically impossible to bisect (at least I've > failed it with bug 94406). Do you think things like that will get > sorted by the time you get to zero diff point of existing directories?
The goal is to get to no diff outside src/intel, at which point anything that could break GL on master should be bisectable. This isn't so much a question about full-history merge vs squash merge though. If we didn't merge, we'd just have a giant squashed commit that adds the entire vulkan driver, which is even less bisectable in case of regressions. Kristian > Gražvydas > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev