[vtk-developers] vtk-m issue

[Nicolas Vuaille]

Hi,

To get the correct commit of a submodule (as VTKm), you need to run `git
submodule update` in the VTK directory.

Nicolas

2018-05-26 2:22 GMT+02:00 Andrew Maclean <andrew.amaclean at gmail.com>:

> I have been noticing that when running git status the following message
> arises in relation to vtk-m
> ​
> (Windows 10 and Linux)
> ​.​
>
> Changes not staged for commit:
>  (use "git add <file>..." to update what will be committed)
>  (use "git checkout -- <file>..." to discard changes in working directory)
>
>        modified:   ThirdParty/vtkm/vtk-m (new commits)
>
> Running a diff reveals:
> $ git diff ThirdParty/vtkm/vtk-m
> diff --git a/ThirdParty/vtkm/vtk-m b/ThirdParty/vtkm/vtk-m
> index 7cf0926172..6a908cc9da 160000
> --- a/ThirdParty/vtkm/vtk-m
> +++ b/ThirdParty/vtkm/vtk-m
> @@ -1 +1 @@
> -Subproject commit 7cf09261725ce848514185420b94e0d5655ec4fa
> +Subproject commit 6a908cc9da6076a42d41b9397ad71f56a1f69a70
>
> So I do:
> $ git checkout -- ThirdParty/vtkm/vtk-m
> $ git pull --rebase
>  Already up to date.
> Current branch master is up to date.
> $ git status
> On branch master
> Your branch is up to date with 'origin/master'.
>
> Changes not staged for commit:
>  (use "git add <file>..." to update what will be committed)
>  (use "git checkout -- <file>..." to discard changes in working directory)
>
>        modified:   ThirdParty/vtkm/vtk-m (new commits)
>
> Is there an extra step that I have to do in relation to vtk-m now?
>
> Thanks
>    Andrew
>
> --
> ___________________________________________
> Andrew J. P. Maclean
>
> ___________________________________________
>
> _______________________________________________
> Powered by www.kitware.com
>
> Visit other Kitware open-source projects at http://www.kitware.com/
> opensource/opensource.html
>
> Search the list archives at: http://markmail.org/search/?q=vtk-developers
>
> Follow this link to subscribe/unsubscribe:
> https://vtk.org/mailman/listinfo/vtk-developers
>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://vtk.org/pipermail/vtk-developers/attachments/20180528/a60e79aa/attachment.html>