Merged repo for protocol headers? Why are they split?

Emil Velikov emil.l.velikov at gmail.com
Thu Nov 30 13:28:29 UTC 2017


On 29 November 2017 at 13:40, Daniel Martin <consume.noise at gmail.com> wrote:
> On 28 November 2017 at 16:51, Emil Velikov <emil.l.velikov at gmail.com> wrote:
>> One reasonably easy way to fold the repositories [while preserving all
>> the history] is via git filter-branch.
>
> Yes, but, filter-branch rewrites the history too. As Peter stated
> earlier, this breaks commit messages referencing other commits.
>
Right. I did not know there are such references in the protos codebase.
Seemingly are are a few :-\ Two ideas come to mind:
 - amend + add reference to the original sha
 - amend + adjust the sha to the new one

>> See xserver commit 35dc7c75150733dbcef8a18b6796f49a7c48ebee which
>> imports modesetting.
>
> So, we have an example where we accepted to rewrite history.
>
AFAICT in that case there are no references, so it's a little safer ;-)


>> One could even script the process ;-)
>
> PoC: https://github.com/bartsch/proto2k-generator/blob/master/generator.sh

Not sure if one needs all the fancy stuff with ls-tree - as we want
separate subdirs a simple mkdir + mv should suffice.

Either way, I'm just sharing some ideas. It'll be up-to the core X
devs to decide on the approach.

HTH
Emil


More information about the xorg-devel mailing list