<div dir="ltr"><div class="gmail_default" style="font-size:small">Hi Aron,</div><div class="gmail_default" style="font-size:small"><br></div><div class="gmail_default" style="font-size:small">That seems to have worked.</div><div class="gmail_default" style="font-size:small"><br></div><div class="gmail_default" style="font-size:small">Thankyou very much.</div><div class="gmail_default" style="font-size:small"><br></div><div class="gmail_default" style="font-size:small">Regards</div><div class="gmail_default" style="font-size:small"> Andrew</div><div class="gmail_default" style="font-size:small"><br></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Nov 8, 2017 at 1:08 PM, Aron Helser <span dir="ltr"><<a href="mailto:aron.helser@kitware.com" target="_blank">aron.helser@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">Hi Andrew,<div>If you see the <span style="font-size:12.8px"> </span><span style="font-size:12.8px">“local changes checked into the index but not commited” message again,</span></div><div><span style="font-size:12.8px">try 'git submodule update' - it helps me sometimes.</span></div><div><span style="font-size:12.8px"><br></span></div><div><span style="font-size:12.8px">vtk-m recently started using git lfs to download its test data files, I think. You'll need to go install it for your platform: <a href="https://git-lfs.github.com/" target="_blank">https://git-lfs.<wbr>github.com/</a></span></div><div><span style="font-size:12.8px"><br></span></div><div><span style="font-size:12.8px">HTH,</span></div><div><span style="font-size:12.8px">Aron</span></div></div><div class="gmail_extra"><br><div class="gmail_quote"><div><div class="h5">On Tue, Nov 7, 2017 at 4:15 PM, Andrew Maclean <span dir="ltr"><<a href="mailto:andrew.amaclean@gmail.com" target="_blank">andrew.amaclean@gmail.com</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 dir="ltr"><div class="gmail_default" style="font-size:small">I have been seeing this message in relation to vtk-m:</div><div class="gmail_default" style="font-size:small;display:inline"> </div>git “local changes checked into the index but not commited”<div><div class="gmail_default" style="font-size:small">This is what I see in gitk:</div><div class="gmail_default" style="font-size:small">-----------------</div><div class="gmail_default">Author: </div><div class="gmail_default">Committer: </div><div class="gmail_default">Parent: e74451f07bc90d3671e69634494a10<wbr>e6d556789a (Merge topic 'increment-master-version-numb<wbr>er')</div><div class="gmail_default">Branch: </div><div class="gmail_default">Follows: </div><div class="gmail_default">Precedes: </div><div class="gmail_default"><br></div><div class="gmail_default"> Local uncommitted changes, not checked in to index</div><div class="gmail_default"><br></div><div class="gmail_default">---------------------------- ThirdParty/vtkm/vtk-m ----------------------------</div><div class="gmail_default">Submodule ThirdParty/vtkm/vtk-m contains untracked content</div><div class="gmail_default">Submodule ThirdParty/vtkm/vtk-m contains modified content</div><div class="gmail_default">Submodule ThirdParty/vtkm/vtk-m 891cfe4..3f60845:</div><div class="gmail_default"> > Merge topic 'new-virtual-objects'</div><div class="gmail_default"> > Merge topic 'remove_vtkm_override'<span style="font-size:small"></span></div><div class="gmail_default"><span style="font-size:small"><br></span></div><div class="gmail_default"><span style="font-size:small">----------</span></div><br><div><div class="gmail_default" style="font-size:small">So after finally giving up trying to fix this, I did a fresh checkout and I now get this:</div><div class="gmail_default" style="font-size:small"><br></div><div class="gmail_default">$ git submodule update --init</div><div class="gmail_default">Submodule 'VTK-m' (<a href="https://gitlab.kitware.com/vtk/vtk-m.git" target="_blank">https://gitlab.kitware.com/vt<wbr>k/vtk-m.git</a>) registered for path 'ThirdParty/vtkm/vtk-m'</div><div class="gmail_default">Cloning into 'C:/Development/Kitware/src/VT<wbr>K/ThirdParty/vtkm/vtk-m'...</div><div class="gmail_default">git: 'lfs' is not a git command. See 'git --help'.</div><div class="gmail_default"><br></div><div class="gmail_default">Did you mean this?</div><div class="gmail_default"> flow</div><div class="gmail_default">error: external filter git lfs smudge %f failed 1</div><div class="gmail_default">error: external filter git lfs smudge %f failed</div><div class="gmail_default">fatal: data/sample.cosmotools: smudge filter lfs failed</div><div class="gmail_default">Unable to checkout '891cfe4aec626d7e07e184a5bd92c<wbr>48405714b69' in submodule path 'ThirdParty/vtkm/vtk-m'</div><div class="gmail_default"><br></div><div class="gmail_default" style="font-size:small"> If you run git submodule update --init again you get something like this:</div><div class="gmail_default" style="font-size:small"><div class="gmail_default">error: The following untracked working tree files would be overwritten by checkout:</div><div class="gmail_default"> .clang-format</div><div class="gmail_default"> .gitattributes</div><div class="gmail_default"> CMake/FindEGL.cmake</div><div class="gmail_default"> CMake/FindGLEW.cmake</div><div class="gmail_default"> CMake/FindGLFW.cmake</div><div class="gmail_default"> CMake/FindMESA.cmake</div><div class="gmail_default"> CMake/FindPyexpander.cmake</div><div class="gmail_default"> CMake/FindTBB.cmake</div><div class="gmail_default"> CMake/FindThrust.cmake</div><div class="gmail_default"> CMake/<a href="http://TestBuild.cxx.in" target="_blank">TestBuild.cxx.in</a></div><div class="gmail_default"> CMake/VTKmBuildDocumentation.c<wbr>make</div><div class="gmail_default"> ... </div><div class="gmail_default"><div class="gmail_default">Please move or remove them before you can switch branches.</div><div class="gmail_default">Aborting</div><div class="gmail_default">Unable to checkout '891cfe4aec626d7e07e184a5bd92c<wbr>48405714b69' in submodule path 'ThirdParty/vtkm/vtk-m'</div><div><br></div></div><div class="gmail_default"><br></div><div class="gmail_default">Does anyone know what is going on?</div></div><br></div><div><br></div><div><br></div><div><div class="gmail_default" style="font-size:small">Thanks</div><span class="m_7602569300032594635HOEnZb"><font color="#888888"><div class="gmail_default" style="font-size:small"> Andrew</div><br></font></span></div><span class="m_7602569300032594635HOEnZb"><font color="#888888">-- <br><div class="m_7602569300032594635m_-6545910205316042192gmail_signature">______________________________<wbr>_____________<br>Andrew J. P. Maclean<br><br>______________________________<wbr>_____________</div>
</font></span></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><br></div>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature" data-smartmail="gmail_signature">___________________________________________<br>Andrew J. P. Maclean<br><br>___________________________________________</div>
</div>