[Paraview-developers] CVS->Git Transition Plan

[Utkarsh Ayachit]

A problem with applying patches for me has been the failures due
$Revision$ and other $CVS$ differences between the two repos. Updating
your cvs repo using "cvs up -kk" before generating the patch file to
apply might help in such cases.

Utkarsh

On Thu, Apr 22, 2010 at 8:30 AM, Biddiscombe, John A. <biddisco at cscs.ch> wrote:
>
> I failed miserably, no matter what I tried, I could not get the patch to apply properly. I knew this would happen, because they never work in my experience, at least during my N years of using CVS/svn etc. Anyway, I instead looped over the modified files from the CVS repo, copied them into their equivalent place in the git repo, and I have all my diffs there (fingers crossed, that the repos are really at the same branch point). Now I must carefully apply them to numerous git branches depending on which tweak they are part of.
>
> NB. It's remarkable how many git wiki/howto/faq pages out there contain examples which when you follow them line by line, don't work.
>
> Thanks anyway for the help.
>
> JB
>
>> -----Original Message-----
>> From: pat marion [mailto:pat.marion at kitware.com]
>> Sent: 22 April 2010 00:42
>> To: Biddiscombe, John A.
>> Cc: Brad King; ParaView Developers
>> Subject: Re: [Paraview-developers] CVS->Git Transition Plan
>>
>> I can't comment about why your patch is failing, but why git diff leaves you
>> with a clean repo:
>>
>> git help apply
>> See --reject flag.
>>
>> Pat
>>
>>
>> On Wed, Apr 21, 2010 at 6:38 PM, Biddiscombe, John A. <biddisco at cscs.ch>
>> wrote:
>>
>>
>>       Brad, Pat
>>
>>       Thank you both for the links and instructions. After some reading and
>> experimenting, I think I have the correct paraview checkout with submodules,
>>       I created a patch - but when I apply it, I get this (below).
>>
>>       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.
>>
>>       Sorry for being useless. Any clues appreciated.
>>
>>       JB
>>
>>
>>       git apply /users/biddisco/pv-meshless.patch
>>       /users/biddisco/pv-meshless.patch:54: trailing whitespace.
>>        <Proxy group="sources" name="EarthSource" />
>>       /users/biddisco/pv-meshless.patch:149: trailing whitespace.
>>       SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin CACHE
>> PATH
>>       /users/biddisco/pv-meshless.patch:151: trailing whitespace.
>>       SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin CACHE
>> PATH
>>       /users/biddisco/pv-meshless.patch:157: trailing whitespace.
>>
>>       /users/biddisco/pv-meshless.patch:158: trailing whitespace.
>>       # The old ones that need to be updated
>>       error: ParaView/CMakeLists.txt: No such file or directory
>>       error: ParaView/ParaViewFilters.xml: No such file or directory
>>       error: ParaView/ParaViewSources.xml: No such file or directory
>>       error: patch failed: Plugins/H5PartReader/vtkH5PartReader.cxx:1
>>       error: Plugins/H5PartReader/vtkH5PartReader.cxx: patch does not apply
>>       error: patch failed: Servers/Filters/vtkCleanUnstructuredGrid.cxx:25
>>       error: Servers/Filters/vtkCleanUnstructuredGrid.cxx: patch does not
>> apply
>>       error: patch failed:
>> Servers/ServerManager/vtkSMArrayListDomain.cxx:33
>>       error: Servers/ServerManager/vtkSMArrayListDomain.cxx: patch does not
>> apply
>>       error: patch failed:
>> Servers/ServerManager/vtkSMStringVectorProperty.cxx:23
>>       error: Servers/ServerManager/vtkSMStringVectorProperty.cxx: patch
>> does not apply
>>       error: patch failed: VTK/Common/vtkLookupTable.cxx:21
>>       error: VTK/Common/vtkLookupTable.cxx: patch does not apply
>>       error: patch failed: VTK/Hybrid/vtkTemporalShiftScale.cxx:14
>>       error: VTK/Hybrid/vtkTemporalShiftScale.cxx: patch does not apply
>>       error: patch failed: VTK/Hybrid/vtkTemporalSnapToTimeStep.cxx:14
>>       error: VTK/Hybrid/vtkTemporalSnapToTimeStep.cxx: patch does not apply
>>       error: patch failed:
>> VTK/Parallel/vtkCachingInterpolatedVelocityField.cxx:24
>>       error: VTK/Parallel/vtkCachingInterpolatedVelocityField.cxx: patch
>> does not apply
>>       error: patch failed:
>> VTK/VolumeRendering/vtkVolumeTextureMapper3D.cxx:26
>>       error: VTK/VolumeRendering/vtkVolumeTextureMapper3D.cxx: patch does
>> not apply
>>
>>
>>
>>
>>
>
> _______________________________________________
> Paraview-developers mailing list
> Paraview-developers at paraview.org
> http://public.kitware.com/mailman/listinfo/paraview-developers
>