<div dir="ltr"><div><div>Except that that email applied to ParaView not VTK. VTK changed its brace style last summer. See the MRs here for the changes to VTK:<br><a href="https://gitlab.kitware.com/vtk/vtk/merge_requests/1932">https://gitlab.kitware.com/vtk/vtk/merge_requests/1932</a><br><a href="https://gitlab.kitware.com/vtk/vtk/merge_requests/1911">https://gitlab.kitware.com/vtk/vtk/merge_requests/1911</a><br><br></div><div>There may be instructions in the commit messages (or at least the commands run to produce them.<br></div>As far as rebasing across the transition, I don't know if there are instructions for VTK. I can't find them searching my old email but I may be missing them. Does anyone else on the list have instructions for Jon to help rebase his branches?<br><br></div>Shawn<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Feb 6, 2017 at 11:02 AM, Haocheng Liu <span dir="ltr"><<a href="mailto:haocheng.liu@kitware.com" target="_blank">haocheng.liu@kitware.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><div style="font-size:12.8px"><div><div><div><div><div>excerpt From Shawn's email:</div><div><br></div><div>Hi all,<br><br></div>The branch to switch to <span class="m_7567617444593715665gmail-il">clang</span>-format was just merged.<br><br></div><div>For those creating a new branch, you can use the script in Utilities/Scripts/<span class="m_7567617444593715665gmail-il">clang</span>-format<wbr>.bash to apply formatting before you commit your changes. You will need to have <span class="m_7567617444593715665gmail-il">clang</span>-format 3.8 or higher installed.<br></div><div><br></div>If you have any outstanding branches they will need to be rebased across the transition. The process to do this is:<br></div>1) Rebase your work on the empty commit prior to the transition (609f2afcd5e2f963e4fe36203b08d<wbr>2ebfc0476f9). This will require you to fix any changes that conflict with the doxygen style comment update. ParaView switched to /** style doxygen comments like VTK did last month.<br></div>2) Run `git filter-branch --tree-filter 'Utilties/Scripts/<span class="m_7567617444593715665gmail-il">clang</span>-format<wbr>.bash --tracked' 609f2afcd5e2f963e4fe36203b08d2<wbr>ebfc0476f9~..HEAD` This will rewrite each commit from the empty commit to the top of your branch to have the new format. The empty commit's rewrite will become equivalent to the convert-to-<span class="m_7567617444593715665gmail-il">clang</span>-format commit.<br></div>3) Run `git rebase b41d27999a4ac854f4a0e61d98d09c<wbr>53e7583a60` to rebase your branch onto the commit where the <span class="m_7567617444593715665gmail-il">clang</span>-format changes were merged. The "empty commit" should go away since all of its changes were applied by the 'apply <span class="m_7567617444593715665gmail-il">clang</span>-format' commit and only the rewritten commits in your branch should remain.<br><br></div><span style="font-size:12.8px">That will get your branch rebased across the style transition. You can then rebase it on master or put it up for review if there are no further conflicts.</span><span class="m_7567617444593715665gmail-HOEnZb" style="font-size:12.8px"><font color="#888888"><br></font></span><div><span style="font-size:12.8px"><br></span></div><div><span style="font-size:12.8px"><br></span></div><div><span style="font-size:12.8px">Hope it helps.</span></div></div><div class="gmail_extra"><br><div class="gmail_quote"><div><div class="h5">On Mon, Feb 6, 2017 at 10:44 AM, Biddiscombe, John A. <span dir="ltr"><<a href="mailto:biddisco@cscs.ch" target="_blank">biddisco@cscs.ch</a>></span> wrote:<br></div></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div><div class="h5">
<div bgcolor="white" link="#0563C1" vlink="#954F72" lang="EN-GB">
<div class="m_7567617444593715665m_-1414746885140019335WordSection1">
<p class="MsoNormal"><span style="font-size:11.0pt" lang="EN-US">Apologies for duplicate posts, might have sent this twice by mistake<u></u><u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt" lang="EN-US"><u></u> <u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt" lang="EN-US">Dear list,<u></u><u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt" lang="EN-US"><u></u> <u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt" lang="EN-US">I have many branches of VTK development that go back some years and have not been well maintained recently. I tried updating some of my code over the weekend and have thousands of conflicts due
to the reformatting of VTK to change the indentation and some other mass changes.</span><span style="font-size:11.0pt"><u></u><u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt" lang="EN-US"> </span><span style="font-size:11.0pt"><u></u><u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt" lang="EN-US">Is there a wiki entry anywhere that can help me run some reformat scripts on my branches to minimize some of the conflicts I’m getting.</span><span style="font-size:11.0pt"><u></u><u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt" lang="EN-US"> </span><span style="font-size:11.0pt"><u></u><u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt" lang="EN-US">Many thanks</span><span style="font-size:11.0pt"><u></u><u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt" lang="EN-US"> </span><span style="font-size:11.0pt"><u></u><u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt" lang="EN-US">JB</span><span style="font-size:11.0pt"><u></u><u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt"> <u></u><u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt" lang="EN-US">--</span><span style="font-size:11.0pt"><u></u><u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt" lang="EN-US">John Biddiscombe, <wbr> email:biddisco @.at.@ <a href="http://cscs.ch" target="_blank">cscs.ch</a></span><span style="font-size:11.0pt"><u></u><u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt" lang="EN-US"><a href="http://www.cscs.ch/" target="_blank">http://www.cscs.ch/</a></span><span style="font-size:11.0pt"><u></u><u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt" lang="EN-US">CSCS, Swiss National Supercomputing Centre | Tel: <a href="tel:+41%2091%20610%2082%2007" value="+41916108207" target="_blank">+41 (91) 610.82.07</a></span><span style="font-size:11.0pt"><u></u><u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt" lang="IT-CH">Via Trevano 131, 6900 Lugano, Switzerland | Fax: <a href="tel:+41%2091%20610%2082%2082" value="+41916108282" target="_blank">+41 (91) 610.82.82</a></span><span style="font-size:11.0pt"><u></u><u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt"> <u></u><u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt"> <u></u><u></u></span></p>
<p class="MsoNormal"><span style="font-size:11.0pt" lang="EN-US"> </span><span style="font-size:11.0pt"><u></u><u></u></span></p>
<p class="MsoNormal"><u></u> <u></u></p>
</div>
</div>
<br></div></div>______________________________<wbr>_________________<br>
Powered by <a href="http://www.kitware.com" rel="noreferrer" target="_blank">www.kitware.com</a><br>
<br>
Visit other Kitware open-source projects at <a href="http://www.kitware.com/opensource/opensource.html" rel="noreferrer" target="_blank">http://www.kitware.com/opensou<wbr>rce/opensource.html</a><br>
<br>
Search the list archives at: <a href="http://markmail.org/search/?q=vtk-developers" rel="noreferrer" target="_blank">http://markmail.org/search/?q=<wbr>vtk-developers</a><br>
<br>
Follow this link to subscribe/unsubscribe:<br>
<a href="http://public.kitware.com/mailman/listinfo/vtk-developers" rel="noreferrer" target="_blank">http://public.kitware.com/mail<wbr>man/listinfo/vtk-developers</a><br>
<br>
<br></blockquote></div><span class="HOEnZb"><font color="#888888"><br><br clear="all"><div><br></div>-- <br><div class="m_7567617444593715665gmail_signature" data-smartmail="gmail_signature"><div dir="ltr"><div><div dir="ltr">Best regards<div>Haocheng</div><div><br></div><div>Haocheng LIU</div><div><span style="color:rgb(0,0,0);font-size:12.8px">Kitware, Inc.</span><br style="color:rgb(0,0,0);font-size:12.8px"><span style="color:rgb(0,0,0);font-size:12.8px">R&D Engineer</span><br style="color:rgb(0,0,0);font-size:12.8px"><span style="color:rgb(0,0,0);font-size:12.8px">21 Corporate Drive</span><br style="color:rgb(0,0,0);font-size:12.8px"><span style="color:rgb(0,0,0);font-size:12.8px">Clifton Park, NY 12065-8662</span><br style="color:rgb(0,0,0);font-size:12.8px"><span style="color:rgb(0,0,0);font-size:12.8px">Phone: </span><a href="tel:(518)%20881-4421" value="+15188814443" style="color:rgb(17,85,204);font-size:12.8px" target="_blank">518-881-4421</a><br></div></div></div></div></div>
</font></span></div>
<br>______________________________<wbr>_________________<br>
Powered by <a href="http://www.kitware.com" rel="noreferrer" target="_blank">www.kitware.com</a><br>
<br>
Visit other Kitware open-source projects at <a href="http://www.kitware.com/opensource/opensource.html" rel="noreferrer" target="_blank">http://www.kitware.com/<wbr>opensource/opensource.html</a><br>
<br>
Search the list archives at: <a href="http://markmail.org/search/?q=vtk-developers" rel="noreferrer" target="_blank">http://markmail.org/search/?q=<wbr>vtk-developers</a><br>
<br>
Follow this link to subscribe/unsubscribe:<br>
<a href="http://public.kitware.com/mailman/listinfo/vtk-developers" rel="noreferrer" target="_blank">http://public.kitware.com/<wbr>mailman/listinfo/vtk-<wbr>developers</a><br>
<br>
<br></blockquote></div><br></div>