[llvm-dev] Phabricator -> GitHub PRs?

David Greene via llvm-dev llvm-dev at lists.llvm.org
Wed Jan 22 14:24:30 PST 2020


Christian K├╝hnel via llvm-dev <llvm-dev at lists.llvm.org> writes:

>>> In Github pull requests there is always a git commit that you can just
>>> feed to the build server. And you can be sure of what really gets merged.
>>> You review, build and test exactly the change that gets merged afterwards.
>>>
>>
>> How would that be true? Given that upstream keep changing during the
>> period of review? The commit is going to have to be rebased to head and
>> that may involve making changes.
>>
>
> Yes, github tells you, that your PR has a merge conflict, that you need to
> resolve manually. Once you've pushed the conflict resolution to the same
> PR, it triggers another round of builds and tests. And also potentially
> another review, depending on what permissions you have and how the project
> ist set up...

It's not quite that simple though.  In general most PRs will need to be
rebased just before merging to maintain linear history.  What happens
then?  Would things need to pass another build before the "final merge?"
If so, then something needs to keep a list of pending PRs waiting for
"final merge."  This quickly gets very hairy as pending PRs have to
constantly be rebased and rebuilt as other PRs land.

Phab isn't any better in this regard.  I'm just pointing out that
requiring things to build/test before "final merge" is a hard problem
regardless of the code review platform.

                          -David


More information about the llvm-dev mailing list