On Wed, Aug 6, 2014 at 1:17 AM, Ben Nemec <openst...@nemebean.com> wrote:

> On 08/05/2014 03:14 PM, Yuriy Taraday wrote:
> > On Tue, Aug 5, 2014 at 10:48 PM, Ben Nemec <openst...@nemebean.com>
> wrote:
> >
> >> On 08/05/2014 10:51 AM, ZZelle wrote:
> >>> Hi,
> >>>
> >>>
> >>> I like the idea  ... with complex change, it could useful for the
> >>> understanding to split it into smaller changes during development.
> >>
> >> I don't understand this.  If it's a complex change that you need
> >> multiple commits to keep track of locally, why wouldn't reviewers want
> >> the same thing?  Squashing a bunch of commits together solely so you
> >> have one review for Gerrit isn't a good thing.  Is it just the warning
> >> message that git-review prints when you try to push multiple commits
> >> that is the problem here?
> >
> >
> > When you're developing some big change you'll end up with trying dozens
> of
> > different approaches and make thousands of mistakes. For reviewers this
> is
> > just unnecessary noise (commit title "Scratch my last CR, that was
> > bullshit") while for you it's a precious history that can provide basis
> for
> > future research or bug-hunting.
> So basically keeping a record of how not to do it?

Well, yes, you can call version control system "a history of failures".
Because if there were no failures there would've been one omnipotent commit
that does everything you want it to.

>  I get that, but I
> think I'm more onboard with the suggestion of sticking those dead end
> changes into a separate branch.  There's no particular reason to keep
> them on your working branch anyway since they'll never merge to master.

The commits themselves are never going to merge to master but that's not
the only meaning of their life. With current tooling "working branch" ends
up a patch series that is constantly rewritten with no proper history of
when did that happen and why. As I said, you can't find roots of bugs in
your code, you can't dig into old versions of your code (what if you need a
method that you've already created but removed because of some wrong

 They're basically unnecessary conflicts waiting to happen.

No. They are your local history. They don't need to be rebased on top of
master - you can just merge master into your branch and resolve conflicts
once. After that your "autosquashed" commit will merge clearly back to

> > Merges are one of the strong sides of Git itself (and keeping them very
> > easy is one of the founding principles behind it). With current workflow
> we
> > don't use them at all. master went too far forward? You have to do rebase
> > and screw all your local history and most likely squash everything anyway
> > because you don't want to fix commits with known bugs in them. With
> > proposed feature you can just do merge once and let 'git review' add some
> > magic without ever hurting your code.
> How do rebases screw up your local history?  All your commits are still
> there after a rebase, they just have a different parent.  I also don't
> see how rebases are all that much worse than merges.  If there are no
> conflicts, rebases are trivial.  If there are conflicts, you'd have to
> resolve them either way.

Merge is a new commit, new recorded point in history. Rebase is rewriting
your commit, replacing it with a new one, without any record in history (of
course there will be a record in reflog but there's not much tooling to
work with it). Yes, you just apply your patch to a different version of
master branch. And then fix some conflicts. And then fix some tests. And
then you end up with totally different commit.
I totally agree that life's very easy when there's no conflicts and you've
written all your feature in one go. But that's almost never the true.

> I also reiterate my point about not keeping broken commits on your
> working branch.  You know at some point they're going to get
> accidentally submitted. :-)

Well... As long as you use 'git review' to upload CRs, you're safe. If you
do 'git push gerrit HEAD:refs/for/master' you're screwed. But why would you
do that?

> As far as letting git review do magic, how is that better than "git
> rebase once and no magic required"?  You deal with the conflicts and
> you're good to go.

In a number of manual tasks it's the same. If your patch cannot be merged
into master, you merge master to your local branch and you're good to go.
But as I said, merge will be remembered, rebase won't. And after that
rebase/merge you might end up having your tests failing, and you'll have to
rewrite your commit again with --amend, with no record in history.

> And if someone asks you to split a commit, you can
> do it.  With this proposal you can't, because anything but squashing
> into one commit is going to be a nightmare (which might be my biggest
> argument against this).

You can do it with the new approach as well. See at the end of the
proposal. You split your current branch into a number of branches and let
git-review detect who depends on who between them.

> And speaking about breaking down of change requests don't forget support
> > for change requests chains that this feature would lead to. How to you
> deal
> > with 5 consecutive change request that are up on review for half a year?
> > The only way I could suggest to my colleague at a time was "Erm... Learn
> > Git and dance with rebases, detached heads and reflogs!" My proposal
> might
> > take care of that too.
> >
> How does this relate to commit series?  Squashing all the commits into
> one isn't a solution to any of the problems with those (if it were, we
> could do that today :-).

At the end of the proposal I mention how. You keep a separate branch for
every commit in the series. You merge them into each other as needed, you
can fix them separately, you can change the dependency order. And every
single step will be recorded in your local repo.

> FWIW, I have had long-lived patch series, and I don't really see what is
> so difficult about running git rebase master.  Other than conflicts, of
> course, which are going to be an issue with any long-running change no
> matter how it's submitted.  There isn't a ton of git magic involved.

Yeah. As long as all you need is to keep them aligned with master, you can
just rebase. But what if you have 5 commits in the series and you need to
fix commit #2 that's heavily used in commit #4? You can either constantly
do interactive rebase (for each small change, actually) or work on top of
commit #4, then stash your changes and amend commit #2 with them. And you
can't "commit early, commit often" during this process because a "commit"
is a long task. You can only hope you won't lose one part of it while
fixing the other one.

> So as you may have guessed by now, I'm opposed to adding this to
> git-review.  I think it's going to encourage bad committer behavior
> (monolithic commits) and doesn't address a use case I find compelling
> enough to offset that concern.

And I hope to show you that even if you wouldn't use this feature, others
might find it extremely useful.
It won't encourage having single monolithic change request. It just allows
you to keep track of its development locally. Nothing changes from
reviewer's point of view.


Kind regards, Yuriy.
OpenStack-dev mailing list

Reply via email to