I can't comment about why your patch is failing, but why git diff leaves you with a clean repo:<br><br>git help apply<br>See --reject flag.<br><br>Pat<br><br><div class="gmail_quote">On Wed, Apr 21, 2010 at 6:38 PM, Biddiscombe, John A. <span dir="ltr"><<a href="mailto:biddisco@cscs.ch">biddisco@cscs.ch</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">Brad, Pat<br>
<br>
Thank you both for the links and instructions. After some reading and experimenting, I think I have the correct paraview checkout with submodules,<br>
I created a patch - but when I apply it, I get this (below).<br>
<br>
Any idea why patching the files would fail. I assumed that all the other files were ok (a few hundred at most which don't get mentioned in the output below - no idea where they ended up), but when I do git diff, it tells me my repo is clean, so it did nothing, not even those with good patches.<br>
<br>
Sorry for being useless. Any clues appreciated.<br>
<br>
JB<br>
<br>
<br>
git apply /users/biddisco/pv-meshless.patch<br>
/users/biddisco/pv-meshless.patch:54: trailing whitespace.<br>
<Proxy group="sources" name="EarthSource" /><br>
/users/biddisco/pv-meshless.patch:149: trailing whitespace.<br>
SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin CACHE PATH<br>
/users/biddisco/pv-meshless.patch:151: trailing whitespace.<br>
SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin CACHE PATH<br>
/users/biddisco/pv-meshless.patch:157: trailing whitespace.<br>
<br>
/users/biddisco/pv-meshless.patch:158: trailing whitespace.<br>
# The old ones that need to be updated<br>
error: ParaView/CMakeLists.txt: No such file or directory<br>
error: ParaView/ParaViewFilters.xml: No such file or directory<br>
error: ParaView/ParaViewSources.xml: No such file or directory<br>
error: patch failed: Plugins/H5PartReader/vtkH5PartReader.cxx:1<br>
error: Plugins/H5PartReader/vtkH5PartReader.cxx: patch does not apply<br>
error: patch failed: Servers/Filters/vtkCleanUnstructuredGrid.cxx:25<br>
error: Servers/Filters/vtkCleanUnstructuredGrid.cxx: patch does not apply<br>
error: patch failed: Servers/ServerManager/vtkSMArrayListDomain.cxx:33<br>
error: Servers/ServerManager/vtkSMArrayListDomain.cxx: patch does not apply<br>
error: patch failed: Servers/ServerManager/vtkSMStringVectorProperty.cxx:23<br>
error: Servers/ServerManager/vtkSMStringVectorProperty.cxx: patch does not apply<br>
error: patch failed: VTK/Common/vtkLookupTable.cxx:21<br>
error: VTK/Common/vtkLookupTable.cxx: patch does not apply<br>
error: patch failed: VTK/Hybrid/vtkTemporalShiftScale.cxx:14<br>
error: VTK/Hybrid/vtkTemporalShiftScale.cxx: patch does not apply<br>
error: patch failed: VTK/Hybrid/vtkTemporalSnapToTimeStep.cxx:14<br>
error: VTK/Hybrid/vtkTemporalSnapToTimeStep.cxx: patch does not apply<br>
error: patch failed: VTK/Parallel/vtkCachingInterpolatedVelocityField.cxx:24<br>
error: VTK/Parallel/vtkCachingInterpolatedVelocityField.cxx: patch does not apply<br>
error: patch failed: VTK/VolumeRendering/vtkVolumeTextureMapper3D.cxx:26<br>
error: VTK/VolumeRendering/vtkVolumeTextureMapper3D.cxx: patch does not apply<br>
<br>
<br>
<br>
</blockquote></div><br>