[vtk-developers] vtk-m issue

[Andrew Maclean]

I have been seeing this message in relation to vtk-m:
​   ​
git “local changes checked into the index but not commited”
​This is what I see in gitk:
-----------------
Author:
Committer:
Parent: e74451f07bc90d3671e69634494a10e6d556789a (Merge topic
'increment-master-version-number')
Branch:
Follows:
Precedes:

    Local uncommitted changes, not checked in to index

---------------------------- ThirdParty/vtkm/vtk-m
----------------------------
Submodule ThirdParty/vtkm/vtk-m contains untracked content
Submodule ThirdParty/vtkm/vtk-m contains modified content
Submodule ThirdParty/vtkm/vtk-m 891cfe4..3f60845:
  > Merge topic 'new-virtual-objects'
  > Merge topic 'remove_vtkm_override'​

----------

So after finally giving up trying to fix this, I did a fresh checkout and I
now get this:

$ git submodule update --init
Submodule 'VTK-m' (https://gitlab.kitware.com/vtk/vtk-m.git) registered for
path 'ThirdParty/vtkm/vtk-m'
Cloning into 'C:/Development/Kitware/src/VTK/ThirdParty/vtkm/vtk-m'...
git: 'lfs' is not a git command. See 'git --help'.

Did you mean this?
        flow
error: external filter git lfs smudge %f failed 1
error: external filter git lfs smudge %f failed
fatal: data/sample.cosmotools: smudge filter lfs failed
Unable to checkout '891cfe4aec626d7e07e184a5bd92c48405714b69' in submodule
path 'ThirdParty/vtkm/vtk-m'

 If you run  git submodule update --init​ again you get something like this:
error: The following untracked working tree files would be overwritten by
checkout:
        .clang-format
        .gitattributes
        CMake/FindEGL.cmake
        CMake/FindGLEW.cmake
        CMake/FindGLFW.cmake
        CMake/FindMESA.cmake
        CMake/FindPyexpander.cmake
        CMake/FindTBB.cmake
        CMake/FindThrust.cmake
        CMake/TestBuild.cxx.in
        CMake/VTKmBuildDocumentation.cmake
  ...
Please move or remove them before you can switch branches.
Aborting
Unable to checkout '891cfe4aec626d7e07e184a5bd92c48405714b69' in submodule
path 'ThirdParty/vtkm/vtk-m'


Does anyone know what is going on?



​Thanks
   Andrew​

-- 
___________________________________________
Andrew J. P. Maclean

___________________________________________
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://public.kitware.com/pipermail/vtk-developers/attachments/20171108/f109d46b/attachment.html>