John,<div><br></div><div>A better developer workflow guide would be: <a href="http://paraview.org/ParaView3/index.php/ParaView_Development_Workflow">http://paraview.org/ParaView3/index.php/ParaView_Development_Workflow</a>.</div>
<div>Yes, I'd recommend rebasing the topics to the current origin/master. Feel free to holler if you need any help.</div><div><br></div><div>Utkarsh<br><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Nov 9, 2012 at 11:00 AM, Biddiscombe, John A. <span dir="ltr"><<a href="mailto:biddisco@cscs.ch" target="_blank">biddisco@cscs.ch</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
<div lang="EN-GB" link="blue" vlink="purple">
<div>
<p class=""><span style="font-size:11pt;font-family:Calibri,sans-serif;color:rgb(31,73,125)">I pushed some branches to stage about 6 months ago but never quite finished the final steps to get them into a release.<u></u><u></u></span></p>
<p class=""><span style="font-size:11pt;font-family:Calibri,sans-serif;color:rgb(31,73,125)"><u></u> <u></u></span></p>
<p class=""><span style="font-size:11pt;font-family:Calibri,sans-serif;color:rgb(31,73,125)">I now want to revive those branches and get them into 3.98 if possible.<u></u><u></u></span></p>
<p class=""><span style="font-size:11pt;font-family:Calibri,sans-serif;color:rgb(31,73,125)"><u></u> <u></u></span></p>
<p class=""><span style="font-size:11pt;font-family:'Courier New';color:rgb(31,73,125)">topic_commandproperty_314 -> stage/topic_commandproperty_314<u></u><u></u></span></p>
<p class=""><span style="font-size:11pt;font-family:'Courier New';color:rgb(31,73,125)">topic_stringlist_regex -> stage/topic_stringlist_regex<u></u><u></u></span></p>
<p class=""><span style="font-size:11pt;font-family:Calibri,sans-serif;color:rgb(31,73,125)"><u></u> <u></u></span></p>
<p class=""><span style="font-size:11pt;font-family:Calibri,sans-serif;color:rgb(31,73,125)">Should I rebase them onto master or the rc3.98 tag?. I have finally managed to get a gerrit account (I had to register with google though), so in principle
I can be a developer again. <u></u><u></u></span></p>
<p class=""><span style="font-size:11pt;font-family:Calibri,sans-serif;color:rgb(31,73,125)"><u></u> <u></u></span></p>
<p class=""><span style="font-size:11pt;font-family:Calibri,sans-serif;color:rgb(31,73,125)">If I would like to rebase these branches, is it ok, or should I instead merge them with master? I’m looking at the
<a href="http://www.paraview.org/Wiki/KWSys/Git/Develop" target="_blank">http://www.paraview.org/Wiki/KWSys/Git/Develop</a> page for guidance, but I’ll do it wonrg first time anyway, so I’m hoping someone will tell me before hand
</span><span style="font-size:11pt;font-family:Wingdings;color:rgb(31,73,125)">J</span><span style="font-size:11pt;font-family:Calibri,sans-serif;color:rgb(31,73,125)"><u></u><u></u></span></p>
<p class=""><span style="font-size:11pt;font-family:Calibri,sans-serif;color:rgb(31,73,125)"><u></u> <u></u></span></p>
<p class=""><span style="font-size:11pt;font-family:Calibri,sans-serif;color:rgb(31,73,125)">Thanks<u></u><u></u></span></p>
<p class=""><span style="font-size:11pt;font-family:Calibri,sans-serif;color:rgb(31,73,125)"><u></u> <u></u></span></p>
<p class=""><span style="font-size:11pt;font-family:Calibri,sans-serif;color:rgb(31,73,125)">JB<u></u><u></u></span></p>
<p class=""><span style="font-size:11pt;font-family:Calibri,sans-serif;color:rgb(31,73,125)"><u></u> <u></u></span></p>
<p class=""><span style="font-size:11pt;font-family:Calibri,sans-serif;color:rgb(31,73,125)"><u></u> <u></u></span></p>
<p class=""><span style="font-size:11pt;font-family:Calibri,sans-serif;color:rgb(31,73,125)"><u></u> <u></u></span></p>
<p class=""><b><span lang="EN-US" style="font-size:10pt;font-family:Tahoma,sans-serif">From:</span></b><span lang="EN-US" style="font-size:10pt;font-family:Tahoma,sans-serif"> <a href="mailto:paraview-developers-bounces@paraview.org" target="_blank">paraview-developers-bounces@paraview.org</a> [mailto:<a href="mailto:paraview-developers-bounces@paraview.org" target="_blank">paraview-developers-bounces@paraview.org</a>]
<b>On Behalf Of </b>Utkarsh Ayachit<br>
<b>Sent:</b> 09 November 2012 16:10<br>
<b>To:</b> ParaView Developers<br>
<b>Subject:</b> [Paraview-developers] ParaView Gatekeeper Review Summary<u></u><u></u></span></p><div><div class="h5">
<p class=""><u></u> <u></u></p>
<div>
<p class="">Topics merged into master<u></u><u></u></p>
</div>
<div>
<p class="">-----------------------------------------------<u></u><u></u></p>
</div>
<div>
<p class=""><u></u> <u></u></p>
</div>
<div>
<p class="">0008427-fix-and-improve-quality-of-movies<u></u><u></u></p>
</div>
<div>
<p class="">0013636-fix-cross-compilation<u></u><u></u></p>
</div>
<div>
<p class="">0013637-fix-and-improve-pvsc-files<u></u><u></u></p>
</div>
<div>
<p class="">13497_coprocessing_script_generation<u></u><u></u></p>
</div>
<div>
<p class="">13592-GL2PSCompression<u></u><u></u></p>
</div>
<div>
<p class="">13601-RuntimeMatplotlibCheck<u></u><u></u></p>
</div>
<div>
<p class="">add-catalyst-dir<u></u><u></u></p>
</div>
<div>
<p class="">add-paraview-git-describe<u></u><u></u></p>
</div>
<div>
<p class="">cataylst-depends<u></u><u></u></p>
</div>
<div>
<p class="">fix-contour-cases<u></u><u></u></p>
</div>
<div>
<p class="">fix_generated_doc<u></u><u></u></p>
</div>
<div>
<p class="">fix_representation_example<u></u><u></u></p>
</div>
<div>
<p class="">mesa-specular-color-workaround<u></u><u></u></p>
</div>
<div>
<p class="">move-vtksmpwriterproxy<u></u><u></u></p>
</div>
<div>
<p class="">python-optional-modules<u></u><u></u></p>
</div>
<div>
<p class="">python-optional-modules-2<u></u><u></u></p>
</div>
<div>
<p class="">remove_superbuild_files<u></u><u></u></p>
</div>
<div>
<p class="">suppress-import-errors<u></u><u></u></p>
</div>
<div>
<p class="">suppress-proxy-error<u></u><u></u></p>
</div>
<div>
<p class="">timekeeper-core-move<u></u><u></u></p>
</div>
<div>
<p class="">update_version_numbe<u></u><u></u></p>
</div>
</div></div></div>
</div>
</blockquote></div><br></div></div>