On Tue, Nov 7, 2017 at 9:01 PM, Nicolai Hähnle <nhaeh...@gmail.com> wrote: > On 07.11.2017 18:35, Michel Dänzer wrote: >> >> On 07/11/17 06:28 PM, Marek Olšák wrote: >>> >>> Hi, >>> >>> This patch is too large for the mailing list: >>> >>> >>> https://cgit.freedesktop.org/~mareko/mesa/commit/?h=addrlib&id=0e0f044268d3c1af2e78f161aaa2d92c30167cc1 >> >> >> From the commit log: >> >>> I just overwrote all Mesa files with internal addrlib and discarded >>> hunks that we should probably keep, but I might have missed something. >> >> >> FWIW, if a separate branch was used for importing addrlib changes, Git >> could keep track of our changes to it in the Mesa tree. > > > I concur in principle. In practice, I explored doing that, but the commit > discipline on the internal addrlib repository is pretty crappy, so we'd end > up having to massage commits anyway. Maybe we can find a sweet spot > somewhere by updating slightly more regularly, perhaps once a month.
That's too much time-consuming work with no benefit. I used to do that, but it sucked. I prefer 1 commit with everything - easy conflict resolution, not having to rebase 60 commits that don't make sense. Marek _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
