<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=windows-1256">
<style>
<!--
.EmailQuote
{margin-left:1pt;
padding-left:4pt;
border-left:#800000 2px solid}
-->
</style>
</head>
<body>
<div>
<div style="font-family:Calibri,sans-serif; font-size:11pt">Some additional thoughts.<br>
<br>
WRT: bitbubket RFEs would be<br>
<br>
1. Config to remove merge button and suggest a copy/pasteable git fetch cmd<br>
<br>
2. Config to suggest only maint and master branches for pull requests.<br>
<br>
And on our(integrator) side we create a better tractable branch name - perhaps:<br>
<br>
Pull#-integrator/contributor/feature (or a better encoding)<br>
<br>
Satish</div>
</div>
<div dir="ltr">
<hr>
<span style="font-family:Calibri,sans-serif; font-size:11pt; font-weight:bold">From:
</span><span style="font-family:Calibri,sans-serif; font-size:11pt"><a href="mailto:balay@mcs.anl.gov">Balay, Satish</a></span><br>
<span style="font-family:Calibri,sans-serif; font-size:11pt; font-weight:bold">Sent:
</span><span style="font-family:Calibri,sans-serif; font-size:11pt">ý9/ý13/ý2014 12:35 AM</span><br>
<span style="font-family:Calibri,sans-serif; font-size:11pt; font-weight:bold">To:
</span><span style="font-family:Calibri,sans-serif; font-size:11pt"><a href="mailto:bsmith@mcs.anl.gov">Smith, Barry F.</a>;
<a href="mailto:petsc-dev@mcs.anl.gov">For users of the development version of PETSc</a></span><br>
<span style="font-family:Calibri,sans-serif; font-size:11pt; font-weight:bold">Subject:
</span><span style="font-family:Calibri,sans-serif; font-size:11pt">RE: [petsc-dev] bitbucket pull requests</span><br>
<br>
</div>
<div>
<div>
<div>
<div style="font-family:Calibri,sans-serif; font-size:11pt">I don't consider (2) as an problem of pull request. The issues mentioned are artifacts of our current workflow.<br>
<br>
The primarily difference between new feature by us vs by pull request is the way feature branch is created and populated.<br>
<br>
By us:<br>
<br>
git checkout -b branch; edit; git commit<br>
<br>
Pull request:<br>
<br>
git fetch URL branch<br>
<br>
The remaining workflow is exactly same for both.<br>
<br>
the tracking issues are primarily issues with workflow.<br>
<br>
And the pull request contributors are required to know the workflow. I.e know when to create new branch off maint vs master - this in turn determines the pull request submitted for next vs master.<br>
<br>
Again this is the artifact of the workflow.<br>
<br>
We could decide not to burden contributions with understanding the workflow - and transfer the burden to integrators. I.e if a request is a new branch off master but it should go into maint - we (integrators) would do an appropriate rebase. (we would do
something equivalent if the contribution came in as a patch file)<br>
<br>
But so far we have been requiring contributors to know the workflow. <br>
<br>
Satish</div>
</div>
<div dir="ltr">
<hr>
<span style="font-family:Calibri,sans-serif; font-size:11pt; font-weight:bold">From:
</span><span style="font-family:Calibri,sans-serif; font-size:11pt"><a href="mailto:bsmith@mcs.anl.gov">Barry Smith</a></span><br>
<span style="font-family:Calibri,sans-serif; font-size:11pt; font-weight:bold">Sent:
</span><span style="font-family:Calibri,sans-serif; font-size:11pt">ý9/ý12/ý2014 7:08 PM</span><br>
<span style="font-family:Calibri,sans-serif; font-size:11pt; font-weight:bold">To:
</span><span style="font-family:Calibri,sans-serif; font-size:11pt"><a href="mailto:petsc-dev@mcs.anl.gov">For users of the development version of PETSc</a></span><br>
<span style="font-family:Calibri,sans-serif; font-size:11pt; font-weight:bold">Subject:
</span><span style="font-family:Calibri,sans-serif; font-size:11pt">[petsc-dev] bitbucket pull requests</span><br>
<br>
</div>
</div>
<font size="2"><span style="font-size:10pt">
<div class="PlainText"><br>
The Bitbucket pull request system isn’t that great for our needs.<br>
<br>
1) the damn Merge button<br>
2) Users should always request merging to master or maint but the integrators need to first merge to next and then check the tests and then merge to master (and maint) several and there is not a good way of tracking that. It would be nice if each pull request
tracked if it had been merged to next etc<br>
<br>
BTW: people have done a good job in the last couple of days of cleaning up the pull requests but there is still some old stuff in there that needs cleaning.<br>
<br>
<br>
Barry<br>
<br>
</div>
</span></font></div>
</body>
</html>