Hi Ken,<div><br></div><div>We assume that a developer that would have a branch in next or stage would follow the gatekeeper review emails. And if his branch didn't get merged, he has the opportunity to reply to the gatekeeper review e-mail.</div>
<div><br></div><div>But basically the reason why a branch will be kicked out of next would be because the branch was not ready to be merged into master.</div><div>1) Meaning the gatekeeper is not aware that the branch should be merged into master as no bug gatekeeper-review entry was created. </div>
<div>2) The branch has change the day the gatekeeper review happen. (In that case such behavior may be unfair and we might merge automatically any branch marked as gatekeeper-review automatically - but not promising anything yet)</div>
<div>3) Maybe it was a dead branch used to exercise the dashboard on a given topic but not meant to go to master.<br></div><div><br></div><div>Moreover, if a branch was not ready, it means that it needs more changes which will imply a least a new push/merge. And after such push/merge it will be easier to track any regression instead of summing up all the regression that each branch may bring and then just ignoring them assuming they are not related to your changes.</div>
<div><br></div><div>On top of that, we offer the developer to rewrite its history after each gatekeeper review if a given topic was not merged to master.</div><div><br></div><div>If that seems too complex or too annoying for the community we can certainly do what we used to do. </div>
<div><br></div><div>Thanks,</div><div><br></div><div>Seb</div><div><br></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Wed, Nov 28, 2012 at 11:02 AM, Moreland, Kenneth <span dir="ltr"><<a href="mailto:kmorel@sandia.gov" target="_blank">kmorel@sandia.gov</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div style="font-size:14px;font-family:Calibri,sans-serif;word-wrap:break-word">
<div>
<div>
<div>Is there a formal feedback mechanism to let developers know their topic has been kicked out of next and the reason for it? For example, a note in the bug tracker that pushes the status back to todo or an email to the developer if the reason is because
there is no open issue for the change?</div>
<div><br>
</div>
<div>-Ken</div>
<div>
<div><br>
</div>
</div>
</div>
</div>
<span>
<div style="border-right:medium none;padding-right:0in;padding-left:0in;padding-top:3pt;text-align:left;font-size:11pt;border-bottom:medium none;font-family:Calibri;border-top:#b5c4df 1pt solid;padding-bottom:0in;border-left:medium none">
<span style="font-weight:bold">From: </span>Sebastien Jourdain <<a href="mailto:sebastien.jourdain@kitware.com" target="_blank">sebastien.jourdain@kitware.com</a>><br>
<span style="font-weight:bold">Date: </span>Wednesday, November 28, 2012 8:01 AM<br>
<span style="font-weight:bold">To: </span>"<a href="mailto:paraview@paraview.org" target="_blank">paraview@paraview.org</a>" <<a href="mailto:paraview@paraview.org" target="_blank">paraview@paraview.org</a>>, "<a href="mailto:paraview-developers@paraview.org" target="_blank">paraview-developers@paraview.org</a>"
<<a href="mailto:paraview-developers@paraview.org" target="_blank">paraview-developers@paraview.org</a>><br>
<span style="font-weight:bold">Subject: </span>[EXTERNAL] [Paraview] ParaView GateKeeper Review Summary<br>
</div><div><div class="h5">
<div><br>
</div>
<blockquote style="BORDER-LEFT:#b5c4df 5 solid;PADDING:0 0 0 5;MARGIN:0 0 0 5">
<div>
<div>
<div>Caution, from now on, topics that were in next before the gatekeeper</div>
<div>review and that haven't been merged to master will be automatically</div>
<div>removed from next so next will basically be equivalent to master.</div>
<div><br>
</div>
<div>The reason is to give any contributor the opportunity to rebase their work on top of master in order to get a cleaner history or even remove their branch.</div>
<div>Therefore, from now on, branch that are on stage should be manually</div>
<div>pushed by their owner to next after gatekeeper review. The following command can be run to do so:</div>
<div><br>
</div>
<div># To push without rebasing your work (don't need to be in git repo)</div>
<div># -------</div>
<div>$ ssh <a href="mailto:git@paraview.org" target="_blank">git@paraview.org</a> stage ParaView merge YOUR_STAGE_BRANCH_NAME</div>
<div><br>
</div>
<div><br>
</div>
<div># To rebase your work on top of master</div>
<div># -------</div>
<div>$ git fetch origin</div>
<div>$ git checkout -b YOUR_STAGE_BRANCH_NAME stage/YOUR_STAGE_BRANCH_NAME</div>
<div>$ git rebase origin/master</div>
<div>$ git push stage :YOUR_STAGE_BRANCH_NAME</div>
<div>$ git stage-push</div>
<div>$ git stage-merge</div>
<div><br>
</div>
<div><br>
</div>
<div>Topics remaining on stage: (NOT in NEXT)</div>
<div>---------------------------------------------</div>
<div> 12742_scalar_bar_improvements</div>
<div> 13024-debug-leaks-view</div>
<div> 13047_java_wrapping_for_paraviewcore_and_eclipse_swt_rendering</div>
<div> 13374-slac-multiple-modes</div>
<div> streaming-temporal-AMR</div>
<div> 13598-VRGrabWorldFix</div>
<div> AddTransformsToRepresentations</div>
<div> topic_commandproperty_314</div>
<div> amr_streaming_pass2</div>
<div> update_manta_test</div>
<div> array-calculator-field-data-support</div>
<div> use_more_precise_value_to_describe_interactive_render_timeout</div>
<div> co-processing-fortran-utilities</div>
<div> vr_improvements</div>
<div> fix-use-directory-name-hint</div>
<div><br>
</div>
<div><br>
</div>
<div>Topics merged into master:</div>
<div>---------------------------------------------</div>
<div> 0013683_fix_vtkForceTime</div>
<div>(VTK) 13225_make_vtkPVDataInformation_more_robust</div>
<div> 13229_fix_connect_button_enabled_status</div>
<div> 13439_fix_interactive_render_delay</div>
<div> 13494-multi-apply</div>
<div> 13671_spreadsheet_cell_connectivity</div>
<div> 13673_cleanup_pointsprite_plugin</div>
<div> 13674_fix_static_qt_plugins</div>
<div>(VTK) 13681-matplotlib-python-interp</div>
<div> 13684_enh_csv_reader</div>
<div> cgns-patch</div>
<div> fix-coprocessing-tests</div>
<div> fix-gmv-test</div>
<div> integrate_gmv_reader_contribution</div>
<div> minor_fix</div>
<div> update_nightly_testing_to_RC3</div>
<div><br>
</div>
</div>
</div>
</blockquote>
</div></div></span>
</div>
</blockquote></div><br></div>