<div dir="ltr"><div>I don't think that just running the scripts will magically clear conflicts... it would have to be part of a larger workflow, and I'm not enough of a git master to develop such a workflow.</div><div><br></div><div>In any case, here's how to run my script on a few files:</div><div><br></div><div> python Utilities/Maintenance/vtk_reindent_code.py file1.h file2.cxx ...<br></div><div><br></div><div>and on all of VTK, which a person can do after a rebase in order to make sure no brace changes were missed anywhere:<br></div><div><br></div><div><div> for d in Charts Common Deprecated Domains Examples Filters GUISupport \</div><div> Geovis IO Imaging Infovis Interaction Parallel Rendering \</div><div> Testing Views Web Wrapping; do</div><div> for e in cxx <a href="http://cxx.in">cxx.in</a> txx <a href="http://txx.in">txx.in</a> hxx <a href="http://hxx.in">hxx.in</a> h <a href="http://h.in">h.in</a> c <a href="http://c.in">c.in</a>; do</div><div> find "${d}" -name "*.${e}" -exec \</div><div> python Utilities/Maintenance/vtk_reindent_code.py {} +</div><div> done</div><div> done</div></div><div><br></div><div>Running it on all of VTK can take a while, so running it on just a few files is best in most cases. It's possible to see all files changed by a branch with the following command:</div><div><br></div><div> git diff --name-only origin/master...branch</div><div><br></div><div>Regarding the doxygen script, it can be run like this:</div><div><br></div><div> perl Utilities/Doxygen/<a href="http://doc_header2doxygen.pl">doc_header2doxygen.pl</a> --to output/ file1.h file2.h ...</div><div><br></div><div>So unlike the reindent script, it doesn't modify the files in-place, it needs an output directory.</div><div><br></div><div> - David</div><div><br></div><div class="gmail_extra"><div class="gmail_quote">On Fri, Sep 23, 2016 at 1:10 PM, Bill Lorensen <span dir="ltr"><<a href="mailto:bill.lorensen@gmail.com" target="_blank">bill.lorensen@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">They can just run the Daves' scripts. You may want to remind us...<br>
<div><div><br>
<br>
On Fri, Sep 23, 2016 at 2:52 PM, David Gobbi <<a href="mailto:david.gobbi@gmail.com" target="_blank">david.gobbi@gmail.com</a>> wrote:<br>
> Now is when the devs come after us with torches and pitchforks because all<br>
> outstanding branches have merge conflicts...<br>
><br>
><br>
> On Fri, Sep 23, 2016 at 12:33 PM, David E DeMarle <<a href="mailto:dave.demarle@kitware.com" target="_blank">dave.demarle@kitware.com</a>><br>
> wrote:<br>
>><br>
>> All set.<br>
>> merge away<br>
>><br>
>> David E DeMarle<br>
>> Kitware, Inc.<br>
>> R&D Engineer<br>
>> 21 Corporate Drive<br>
>> Clifton Park, NY 12065-8662<br>
>> Phone: <a href="tel:518-881-4909" value="+15188814909" target="_blank">518-881-4909</a><br>
>><br>
>> On Fri, Sep 23, 2016 at 1:24 PM, David Gobbi <<a href="mailto:david.gobbi@gmail.com" target="_blank">david.gobbi@gmail.com</a>><br>
>> wrote:<br>
>>><br>
>>> Apparently this request didn't reach the crew over in France. So it looks<br>
>>> like we'll be delayed for a while longer.<br>
>>><br>
>>><br>
>>> On Fri, Sep 23, 2016 at 10:00 AM, David E DeMarle<br>
>>> <<a href="mailto:dave.demarle@kitware.com" target="_blank">dave.demarle@kitware.com</a>> wrote:<br>
>>>><br>
>>>> Hey gang,<br>
>>>><br>
>>>> Please hold off on merging anything into master for the next hour or so.<br>
>>>> That will help us get the big formatting change in cleanly.<br>
>>>><br>
>>>> thanks<br>
>>>><br>
>>>> David E DeMarle<br>
>>>> Kitware, Inc.<br>
>>>> R&D Engineer<br>
>>>> 21 Corporate Drive<br>
>>>> Clifton Park, NY 12065-8662<br>
>>>> Phone: <a href="tel:518-881-4909" value="+15188814909" target="_blank">518-881-4909</a><br></div></div></blockquote></div></div></div>