<html>
<head>
<meta content="text/html; charset=windows-1252"
http-equiv="Content-Type">
</head>
<body bgcolor="#FFFFFF" text="#000000">
<p>Frankly, I think the detailed creation history of a PR does not
add a lot of useful information. PR's should contain consistent
sets of changes addressing a particular to-do. We are doing Scrum
with a 3 week cycle, so no change should be really huge. <br>
</p>
<p>Often, the genesis of a particular PR is messy...you do some
stuff, then realize you have to fix something over there...and you
end up with a mess of commits that doesn't make any chronological
sense. <br>
</p>
<p>That said, if we ARE interested in a detailed history of all
commits, we should keep the real history, not some kind of fake
history made to look good or logical when it isn't. Chances are
that we are going to get the history wrong if we make it up after
the fact.</p>
<p>My 0.02€</p>
<p>/Thomas<br>
</p>
<br>
<div class="moz-cite-prefix">On 09/22/2016 01:08 PM, Konrad Kleine
wrote:<br>
</div>
<blockquote
cite="mid:CABRYuGkojcAqcnTNQbJ1x5e9Tgg++3i7qC6pf3xYyQV-AQK1iQ@mail.gmail.com"
type="cite">
<div dir="ltr">Hi Max,
<div><br>
</div>
<div>what KB said is correct: A squash "destroys" the history. </div>
<div><br>
</div>
<div>I can only guess but the reason why we have squash at the
moment is probably best explained when you look at master from
a different angle.</div>
<div><br>
</div>
<div>Suppose you merge a PR with many commits into master and
due to some reasons it doesn't work: Then you have to revert a
whole bunch of commits. To be precise: All the commits until
the next "merge" commit.</div>
<div><br>
</div>
<div>With a squash commit you have just one commit to revert in
master.</div>
<div><br>
</div>
<div>... While writing this, I've changed my mind ;) ....</div>
<div><br>
</div>
<div>I think a good compromise is to keep an eye on your own
commits in your PR. If you think that some commits don't add
any value, you can refine your commit history as long as you
want to get it in "a good shape". The required force push only
works if nobody forked from your branch of course.</div>
<div><br>
</div>
<div>As a reviewer we should check that the history is in good
shape before we approve a PR.</div>
<div><br>
</div>
<div>Sound good?</div>
<div><br>
</div>
<div>Regards</div>
<div>Konrad</div>
<div><br>
</div>
<div><br>
</div>
</div>
<div class="gmail_extra"><br>
<div class="gmail_quote">On Thu, Sep 22, 2016 at 12:27 PM,
Karanbir Singh <span dir="ltr"><<a moz-do-not-send="true"
href="mailto:kbsingh@redhat.com" target="_blank">kbsingh@redhat.com</a>></span>
wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0
.8ex;border-left:1px #ccc solid;padding-left:1ex"><span
class="">-----BEGIN PGP SIGNED MESSAGE-----<br>
Hash: SHA1<br>
<br>
</span>Rebase to master, from the PR would - but then a
merge back to master<br>
would still squash all the commits into 1 change at point of
merge<br>
back into master. Thats how the git repo is setup at the
moment, and<br>
seems wrong to me.<br>
<br>
If a feature is worked on for a few days, across the team,
and then<br>
pushed into a single PR to merge into master, we are
destroying the<br>
entire history of that code.<br>
<br>
regards,<br>
<span class=""><br>
On 21/09/16 19:18, Max Andersen wrote:<br>
> Rebase keeps history does it not ?<br>
><br>
> Sent from my iPhone<br>
><br>
> On 21 Sep 2016, at 18:28, Karanbir Singh <<a
moz-do-not-send="true" href="mailto:kbsingh@redhat.com">kbsingh@redhat.com</a><br>
</span><span class="">> <mailto:<a
moz-do-not-send="true" href="mailto:kbsingh@redhat.com">kbsingh@redhat.com</a>>>
wrote:<br>
><br>
> hi,<br>
><br>
> I just noticed that the only merge option for
almighty-core is now<br>
> squash-and-merge, ie. we cant retain commit history
for the PR's.<br>
> Is this by design ?<br>
><br>
<br>
</span><span class="">- --<br>
Karanbir Singh, Project Lead, The CentOS Project, London,
UK<br>
Red Hat Ext. 8274455 | DID: 0044 207 009 4455<br>
-----BEGIN PGP SIGNATURE-----<br>
Version: GnuPG v2.0.22 (GNU/Linux)<br>
<br>
</span>iQEcBAEBAgAGBQJX47H4AAoJEI3Oi2<wbr>Mx7xbtF6oIAKxV1r7aPkBDySUQVqj+<wbr>5khd<br>
3i+psJ5SCXqLJFEC827K+<wbr>VMEV37pveWtNghRv5MgUKSCGYGX9KP<wbr>kIiasLkW4RNdK<br>
IHtoyp5UvxcvuDGh63doSf0m6vGNit<wbr>BlvtJ9oG9t3DIS+<wbr>bFrAugJ9LKl69cRyQuC<br>
wlPv0Kq+goEkZK/<wbr>CuvPhpM7PWkdLgpKQiJXPreVDohWeZ<wbr>fF6aECA87Mf9elQuDta<br>
Qt77+<wbr>Z3Jj3mjLD1lSDXqrAD58n6HbZQwkKm<wbr>12UUkJpULQA/AO64A1sN1XdYTVxx5<br>
Ka15IQdpY4fbQX2rO/<wbr>qNvcpkQkiIvX7cRSxOLpYmGHxTREPW<wbr>M8O2kPTcrEmnPsE=<br>
=/x5C<br>
<div class="HOEnZb">
<div class="h5">-----END PGP SIGNATURE-----<br>
<br>
______________________________<wbr>_________________<br>
almighty-public mailing list<br>
<a moz-do-not-send="true"
href="mailto:almighty-public@redhat.com">almighty-public@redhat.com</a><br>
<a moz-do-not-send="true"
href="https://www.redhat.com/mailman/listinfo/almighty-public"
rel="noreferrer" target="_blank">https://www.redhat.com/<wbr>mailman/listinfo/almighty-<wbr>public</a><br>
</div>
</div>
</blockquote>
</div>
<br>
</div>
<br>
<fieldset class="mimeAttachmentHeader"></fieldset>
<br>
<pre wrap="">_______________________________________________
almighty-public mailing list
<a class="moz-txt-link-abbreviated" href="mailto:almighty-public@redhat.com">almighty-public@redhat.com</a>
<a class="moz-txt-link-freetext" href="https://www.redhat.com/mailman/listinfo/almighty-public">https://www.redhat.com/mailman/listinfo/almighty-public</a>
</pre>
</blockquote>
<br>
</body>
</html>