<div dir="ltr">you need to amend the commit that changed the VTK sha.<br></div><div class="gmail_extra"><br clear="all"><div><div class="gmail_signature" data-smartmail="gmail_signature"><div dir="ltr">Mathieu Westphal<br></div></div></div>
<br><div class="gmail_quote">On Sun, Sep 18, 2016 at 5:08 PM, Ken Martin <span dir="ltr"><<a href="mailto:ken.martin@kitware.com" target="_blank">ken.martin@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"><div><br></div><div><br></div>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<div><br></div><div><div>$ git commit -a</div><div>pre-commit hook failure</div><div>-----------------------</div><div><br></div><div>This commit would rewind a submodule link:</div><div><br></div><div> "VTK" 7912d34 => 7fe30aa</div><div><br></div><div>from the newer version in HEAD (17249cd). Run</div><div><br></div><div> git reset HEAD -- "VTK"</div><div> git submodule update -- "VTK"</div><div><br></div><div>to checkout the newer version of the submodule in your work tree.</div><div>Then try the commit again.</div><div><br></div><div><br></div><div>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.</div><div><br></div><div>Thanks</div><span class="HOEnZb"><font color="#888888"><div>Ken</div><div><br></div><div><br></div>-- <br><div>Ken Martin PhD<div>Chairman & CFO<br>Kitware Inc.<br>28 Corporate Drive<br>Clifton Park NY 12065<br><a href="tel:518%20371%203971" value="+15183713971" target="_blank">518 371 3971</a><div><br></div><div><span style="font-size:10pt;font-family:tahoma,sans-serif">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.</span></div></div></div>
</font></span></div></div>
<br>______________________________<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/<wbr>opensource/opensource.html</a><br>
<br>
Search the list archives at: <a href="http://markmail.org/search/?q=Paraview-developers" rel="noreferrer" target="_blank">http://markmail.org/search/?q=<wbr>Paraview-developers</a><br>
<br>
Follow this link to subscribe/unsubscribe:<br>
<a href="http://public.kitware.com/mailman/listinfo/paraview-developers" rel="noreferrer" target="_blank">http://public.kitware.com/<wbr>mailman/listinfo/paraview-<wbr>developers</a><br>
<br></blockquote></div><br></div>