<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
<meta name="Generator" content="Microsoft Word 14 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:Wingdings;
panose-1:5 0 0 0 0 0 0 0 0 0;}
@font-face
{font-family:Wingdings;
panose-1:5 0 0 0 0 0 0 0 0 0;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
@font-face
{font-family:Tahoma;
panose-1:2 11 6 4 3 5 4 4 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
margin-bottom:.0001pt;
font-size:12.0pt;
font-family:"Times New Roman","serif";}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
p.MsoAcetate, li.MsoAcetate, div.MsoAcetate
{mso-style-priority:99;
mso-style-link:"Balloon Text Char";
margin:0cm;
margin-bottom:.0001pt;
font-size:8.0pt;
font-family:"Tahoma","sans-serif";}
span.EmailStyle17
{mso-style-type:personal;
font-family:"Calibri","sans-serif";
color:#1F497D;}
span.EmailStyle18
{mso-style-type:personal-reply;
font-family:"Calibri","sans-serif";
color:#1F497D;}
span.BalloonTextChar
{mso-style-name:"Balloon Text Char";
mso-style-priority:99;
mso-style-link:"Balloon Text";
font-family:"Tahoma","sans-serif";}
.MsoChpDefault
{mso-style-type:export-only;
font-size:10.0pt;}
@page WordSection1
{size:612.0pt 792.0pt;
margin:72.0pt 72.0pt 72.0pt 72.0pt;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext="edit" spidmax="1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang="EN-GB" link="blue" vlink="purple">
<div class="WordSection1">
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">Apologies, I’ve read through all the stuff about paraview/develop and how to push branches to stage etc, but nowhere is gerrit mentioned, and when I look on
gerrit, the branches there are all completely different from the stage branches.<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">If we’re supposed to use this gerrit thing, then why is there no mention of it anywhere in the paraview wiki? Where can I find instructions on how to see my
branches in gerrit? (Seems like there are two systems and they’re unrelated).<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">Thanks<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">JB<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D"><o:p> </o:p></span></p>
<div>
<div style="border:none;border-top:solid #B5C4DF 1.0pt;padding:3.0pt 0cm 0cm 0cm">
<p class="MsoNormal"><b><span lang="EN-US" style="font-size:10.0pt;font-family:"Tahoma","sans-serif"">From:</span></b><span lang="EN-US" style="font-size:10.0pt;font-family:"Tahoma","sans-serif""> paraview-developers-bounces@paraview.org [mailto:paraview-developers-bounces@paraview.org]
<b>On Behalf Of </b>Biddiscombe, John A.<br>
<b>Sent:</b> 09 November 2012 17:01<br>
<b>To:</b> Utkarsh Ayachit; ParaView Developers<br>
<b>Subject:</b> Re: [Paraview-developers] ParaView Gatekeeper Review Summary<o:p></o:p></span></p>
</div>
</div>
<p class="MsoNormal"><o:p> </o:p></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">I pushed some branches to stage about 6 months ago but never quite finished the final steps to get them into a release.<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">I now want to revive those branches and get them into 3.98 if possible.<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Courier New";color:#1F497D">topic_commandproperty_314 -> stage/topic_commandproperty_314<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Courier New";color:#1F497D">topic_stringlist_regex -> stage/topic_stringlist_regex<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">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. <o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">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">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:11.0pt;font-family:Wingdings;color:#1F497D">J</span><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D"><o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">Thanks<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D">JB<o:p></o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt;font-family:"Calibri","sans-serif";color:#1F497D"><o:p> </o:p></span></p>
<p class="MsoNormal"><b><span lang="EN-US" style="font-size:10.0pt;font-family:"Tahoma","sans-serif"">From:</span></b><span lang="EN-US" style="font-size:10.0pt;font-family:"Tahoma","sans-serif"">
<a href="mailto:paraview-developers-bounces@paraview.org">paraview-developers-bounces@paraview.org</a> [<a href="mailto:paraview-developers-bounces@paraview.org">mailto: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<o:p></o:p></span></p>
<p class="MsoNormal"><o:p> </o:p></p>
<div>
<p class="MsoNormal">Topics merged into master<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">-----------------------------------------------<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<div>
<p class="MsoNormal">0008427-fix-and-improve-quality-of-movies<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">0013636-fix-cross-compilation<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">0013637-fix-and-improve-pvsc-files<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">13497_coprocessing_script_generation<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">13592-GL2PSCompression<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">13601-RuntimeMatplotlibCheck<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">add-catalyst-dir<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">add-paraview-git-describe<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">cataylst-depends<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">fix-contour-cases<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">fix_generated_doc<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">fix_representation_example<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">mesa-specular-color-workaround<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">move-vtksmpwriterproxy<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">python-optional-modules<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">python-optional-modules-2<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">remove_superbuild_files<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">suppress-import-errors<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">suppress-proxy-error<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">timekeeper-core-move<o:p></o:p></p>
</div>
<div>
<p class="MsoNormal">update_version_numbe<o:p></o:p></p>
</div>
</div>
</body>
</html>