[Paraview-developers] How to roll back a submodules

[Mathieu Westphal]

you need to amend the commit that changed the VTK sha.

Mathieu Westphal

On Sun, Sep 18, 2016 at 5:08 PM, Ken Martin <ken.martin at kitware.com> wrote:

>
>
> I have  PV topic where I updated VTK and  now I want to roll the VTK back
> to its original value.  When I try to do this I get
>
> $ git commit -a
> pre-commit hook failure
> -----------------------
>
> This commit would rewind a submodule link:
>
>   "VTK"  7912d34 => 7fe30aa
>
> from the newer version in HEAD (17249cd).  Run
>
>   git reset HEAD -- "VTK"
>   git submodule update -- "VTK"
>
> to checkout the newer version of the submodule in your work tree.
> Then try the commit again.
>
>
> Anyone know how to get around this and actually move VTK back  to  its
> original value without losing the rest of my topic? I guess I could do a
> diff, create a new  topic and and apply the patch without the VTK change
> but I was wondering if there is a right way to do it.
>
> Thanks
> Ken
>
>
> --
> Ken Martin PhD
> Chairman & CFO
> Kitware Inc.
> 28 Corporate Drive
> Clifton Park NY 12065
> 518 371 3971
>
> This communication, including all attachments, contains confidential and
> legally privileged information, and it is intended only for the use of the
> addressee.  Access to this email by anyone else is unauthorized. If you are
> not the intended recipient, any disclosure, copying, distribution or any
> action taken in reliance on it is prohibited and may be unlawful. If you
> received this communication in error please notify us immediately and
> destroy the original message.  Thank you.
>
> _______________________________________________
> 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=
> Paraview-developers
>
> Follow this link to subscribe/unsubscribe:
> http://public.kitware.com/mailman/listinfo/paraview-developers
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://public.kitware.com/pipermail/paraview-developers/attachments/20160918/8d75872a/attachment.html>