[vtk-developers] Axis-aligned hexahedral cell rendering module

[Stephane Marchesin]

On Fri, Jul 2, 2010 at 10:43, Francois Bertel
<francois.bertel at kitware.com>wrote:

> Hi Stephane,
>
> I guess you created your patch with:
> $ git show > vtk-hexa.diff
>
> because when I try to apply it:
> $ cd VTK
> $ git am -3 -i -s -u ~/vtk-hexa.diff
>
> I have the following error:
> Patch format detection failed.
>
> Then I tried to apply the patch directly:
> $ git apply --whitespace=fix ~/vtk-hexa.diff
>
> I have this output (ignore the trailing whitespace messages, the error
> is about VolumeRendering/Testing/Cxx/CMakeLists.txt):
>
> vtk-hexa.diff:54: trailing whitespace.
> // setup of source -> mapper -> actor -> renderer -> renderwindow is
> vtk-hexa.diff:105: trailing whitespace.
>
> vtk-hexa.diff:119: trailing whitespace.
>
> vtk-hexa.diff:150: trailing whitespace.
>
> vtk-hexa.diff:158: trailing whitespace.
>
> error: patch failed: VolumeRendering/Testing/Cxx/CMakeLists.txt:30
> error: VolumeRendering/Testing/Cxx/CMakeLists.txt: patch does not apply
>
>
> Can you send me the patch again, please?
>
> Make sure you call "$git pull --rebase" first.
>
> Can you instead send me a patch created with "git format-patch", please?
>
> For example,
> $ git format-patch 'HEAD^..HEAD'
> will return the last commit.
>
>
There you go. Alternatively, I can put a git tree online if that works
better with you guys.

Stephane
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://public.kitware.com/pipermail/vtk-developers/attachments/20100706/fb261063/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Add-Axis-aligned-projected-hexahedra-renderer.patch
Type: application/octet-stream
Size: 47461 bytes
Desc: not available
URL: <http://public.kitware.com/pipermail/vtk-developers/attachments/20100706/fb261063/attachment-0001.obj>