<div dir="ltr"><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Fri, Sep 11, 2020 at 1:39 PM Stephen Neuendorffer via llvm-dev <<a href="mailto:llvm-dev@lists.llvm.org">llvm-dev@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div>The LLVM incubator projects have been using github PRs for reviews and so far haven't really seen any significant issues. The biggest confusion so far has not been with reviews but with the difference between "rebase and merge" and "squash and mere". We have used basically 3 different processes:</div><div><br></div><div>Method 1: start a review with one commit on a new branch (typically in a personal repository 'fork'). Respond to review comments by adding additional commits on the same branch. Then you want to "Squash and Merge". Real life example: <a href="https://github.com/llvm/circt/pull/62" target="_blank">https://github.com/llvm/circt/pull/62</a> Note that Github keeps seems to keep a reference to commits where a review occurred, but does not necessarily preserve other commits in the chain. Also note that you can go back and look at either the final disposition of the code on the main page, or view the diff "as reviewed"
to understand comments in their original context.
</div></div></blockquote>
My understanding is this workflow is reliable. The other commits in the chain are reachable, because GitHub allows the PR branch prior to the "Squash and Merge" to be restored as long as people are not reusing PR branches. <br></div><div class="gmail_quote"> <br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div></div><div>Method 2: start a review as a sequence of commits. Respond to review comments by updating your sequence of commits rebasing locally and git push -f to update your branch with a new set of commits. The sequence of commits is preserved using 'rebase and merge'. Real life example:</div></div></blockquote><div>This is likely to lose the context of comments as time/activity progresses. My understanding is that very strict discipline by the developer is needed in addressing inline comments under such a workflow, because inline comments are not handled well by GitHub under this model.<br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div> Method 3: start a review with one commit, respond to review comments with git commit --amend on the commit. git push -f to update your branch. In this case, only one commit is being merged, so 'rebase and merge' and 'squash and merge'. Real life example: <a href="https://github.com/llvm/circt/pull/63" target="_blank">https://github.com/llvm/circt/pull/63</a></div></div></blockquote><div>All of my comments on Method 2 (above) also apply to Method 3.<br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div></div><div></div>Some projects attempt to simplify the options and only allow "squash and merge" as an option. This eliminates Method 2, but also prevents mistakes where people intend to use Method 1, but accidently select "Rebase and merge". This results in undesired commit history littered with a bunch of meaningless commits like "Fix typo.", "Address comments." etc
Method 2 is generally harder to review and discouraged, but seems sometimes necessary when you have dependent commits that are logically separate but need to be reviewed together to make sense.</div></blockquote><div>Method 2 could be handled in Phabricator as a patch series. The general difficulty in reviewing individual commits is a GitHub problem.<br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div></div><div>There seems to be a split between those who prefer to curate commits locally and present them in the PR (i.e. Method 3) as they are to be committed (i.e. squash/amend/etc from my workstation and push the result), and those who seem to feel that it is better to avoid "git rebase" and "git commit --amend" and let github handle rewriting the history with the commit.<br></div></div></blockquote><div>Are these primarily developers or reviewers with these preferences? Are the people using Method 3 handling inline comments diligently? Is GitHub still "great" if Method 1 is the model with the least surprises?<br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><div dir="ltr"><div></div><div><br></div><div>Steve</div><div><br></div><div><br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, Jan 29, 2020 at 12:56 AM Nicolai Hähnle via llvm-dev <<a href="mailto:llvm-dev@lists.llvm.org" target="_blank">llvm-dev@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">On Tue, Jan 28, 2020 at 2:23 PM Renato Golin <<a href="mailto:rengolin@gmail.com" target="_blank">rengolin@gmail.com</a>> wrote:<br>
> On Tue, 28 Jan 2020 at 12:28, Nicolai Hähnle <<a href="mailto:nhaehnle@gmail.com" target="_blank">nhaehnle@gmail.com</a>> wrote:<br>
> > I don't quite follow. Yes, gratuitous useless changes tend to create<br>
> > merge and rebase problems and should generally be avoided. Why does it<br>
> > make a difference whether they're in multiple commits though?<br>
><br>
> I think you misunderstood.<br>
><br>
> Our policy [1] is that independent NFC fixups on existing code should<br>
> be separate from new changes.<br>
><br>
> The point here is that fixups *to the patch* should be squashed into<br>
> their original commits *before* merging.<br>
<br>
Okay, this intention wasn't clear to me from what was written. It<br>
looks like we agree, then.<br>
<br>
<br>
<br>
> Once the patches are in master, and problems have been found, then<br>
> adding a fixup to master is totally fine.<br>
><br>
> We don't want to rewrite history on master, that'd be a nightmare. If<br>
> something is botched, we revert, then reapply.<br>
><br>
> We also don't want to have fixups to things that haven't landed on<br>
> master yet, so cleaning up the patches and series before merging is<br>
> highly encouraged.<br>
><br>
> But during the review, rewriting history of the series itself makes it<br>
> hard for any review tool to have meaningful representations.<br>
<br>
This isn't quite true, as others already pointed out, and *not*<br>
rewriting history can make reviews harder as well! In fact, I've *just<br>
now* had that happen to me on another GitHub project, where this<br>
sequence of events happened:<br>
<br>
1. PR was opened with a series of commits, one of which (call it<br>
commit B for base) is non-trivial and under review separately as a<br>
different PR.<br>
2. Other reviewer makes comments, asks for some refactoring changes.<br>
3. Author makes those changes, adds them as a fixup commit.<br>
4. I can now no longer usefully review the PR, because I only have two<br>
options, both of which are similarly useless:<br>
4a. I look at all changes in the PR, in which case I get a messy<br>
mixture of commit B (which ought to be reviewed separately) and the<br>
rest.<br>
4b. I look at individual commits in the PR, but then I only see a<br>
stale version of the author's work.<br>
<br>
The fixup approach *might* work if there is only a single reviewer,<br>
but even then I suspect things can quickly become messy. And in any<br>
case, the default assumption in LLVM should be that anybody can join a<br>
review at any time.<br>
<br>
The one tool that actually gets this right is Gerrit, which<br>
understands commit series *and* allows you to diff between versions of<br>
a commit. It's unfortunate that Gerrit is so ugly that most people<br>
won't even look at it (and it does have other weaknesses as well,<br>
admittedly).<br>
<br>
Cheers,<br>
Nicolai<br>
<br>
<br>
<br>
> So, it's better to have separate fixups during review, but we really<br>
> should squash them into their related commits in the series before<br>
> pushing.<br>
><br>
> --renato<br>
><br>
> [1] <a href="http://llvm.org/docs/DeveloperPolicy.html" rel="noreferrer" target="_blank">http://llvm.org/docs/DeveloperPolicy.html</a><br>
<br>
<br>
<br>
-- <br>
Lerne, wie die Welt wirklich ist,<br>
aber vergiss niemals, wie sie sein sollte.<br>
_______________________________________________<br>
LLVM Developers mailing list<br>
<a href="mailto:llvm-dev@lists.llvm.org" target="_blank">llvm-dev@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev" rel="noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev</a><br>
</blockquote></div>
_______________________________________________<br>
LLVM Developers mailing list<br>
<a href="mailto:llvm-dev@lists.llvm.org" target="_blank">llvm-dev@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev" rel="noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-dev</a><br>
</blockquote></div></div>