[cfe-dev] [llvm-dev] [Github] RFC: linear history vs merge commits

David Greene via cfe-dev cfe-dev at lists.llvm.org
Wed Jan 30 12:52:20 PST 2019


Jeremy Lakeman via llvm-dev <llvm-dev at lists.llvm.org> writes:

> 4. Each reviewed bug / feature must be rebased onto the current "known
> good" commit, merged into a "probably good" commit, tested by build
> bots, and only then pushed to trunk. Keeping trunk's history more
> usable, with most bad patches reworked and resubmitted instead of
> reverted.

If you mean having a submitted PR trigger builds and only allow merging
if all builds pass, that may be doable.  Of course by the time it's
merged it will be against some later commit (so it should be rebased)
and there's no guarantee it will build against *that* commit.  But it
will tend to filter out most problems.

Trying to keep a branch buildable at all times is a hard problem, but
the above is probably a 90% solution.

                                -David


More information about the cfe-dev mailing list