[vtk-developers] Warnings in vtkfreetype

Sean McBride sean at rogue-research.com
Fri Nov 25 13:07:11 EST 2011


On Wed, 23 Nov 2011 12:31:21 -0500, Brad King said:

>> Fixing the dashboard warnings requires diverging from the
>> version of freetype used, which complicates future merges
>> of newer freetypes.
>
>It isn't very hard to do updates if you use an approach like
>that I use for HDF5:
>
>  http://vtk.org/gitweb?p=VTK.git;a=blob;f=Utilities/vtkhdf5/README-
>VTK.txt;hb=dfa8d922
>
>Basically the original 3rd party code is kept unmodified in
>a special branch and merged into VTK's tree.  Fixes to it
>for our dashboard can be committed directly like any other
>changes.  Later when the 3rd party code is updated, the new
>version can be committed on the special branch and merged
>again.  That way we merge the two paths of changes instead
>of overwriting our version with theirs.

Looks like I'd need to learn much more about git to use that procedure... perhaps next time I update freetype I'll give it a try...

Cheers,

-- 
____________________________________________________________
Sean McBride, B. Eng                 sean at rogue-research.com
Rogue Research                        www.rogue-research.com 
Mac Software Developer              Montréal, Québec, Canada





More information about the vtk-developers mailing list