[Mesa-dev] [PATCH] amd/addrlib: update to latest version

[Michel Dänzer]

On 07/11/17 10:58 PM, Marek Olšák wrote:
> On Tue, Nov 7, 2017 at 9:01 PM, Nicolai Hähnle <nhaehnle at 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.

FWIW, I didn't mean importing individual commits of the addrlib
repository into Mesa. Just having a separate branch[0] where addrlib
snapshots are imported and which is then merged to master. That way Git
will keep track of changes in both repositories and automatically merge
them as much as possible. Just using Git for what it was made for. :)

[0] Note that the separate branch doesn't need to exist in any shared
repository, it can always be re-created from the history of the last merge.


-- 
Earthling Michel Dänzer               |               http://www.amd.com
Libre software enthusiast             |             Mesa and X developer