VTK/Patch Procedure

From KitwarePublic
Jump to navigationJump to search

VTK Patches

To submit a patch for inclusion in a VTK release branch please follow the directions on this page. VTK-5-4 is the current release branch.

Only those changes that have been screened by a nightly dashboard cycle on CVS HEAD will be accepted for merging to the release branch. Yes, you have to wait until tomorrow. No, you may not have an exception.

Zack Galbreath at Kitware, Inc. is the current VTK merge master.

The VTK merge master has some scripts that make the process of merging from CVS HEAD to a release branch as painless as possible.

One of the scripts takes as its input a simple text file that looks something like this: 

 Rendering/Testing/Cxx/TestGaussianBlurPass.cxx new revision: 1.2; previous revision: 1.1
 Rendering/Testing/Cxx/TestGenericVertexAttributesGLSLAlphaBlending.cxx new revision: 1.3; previous revision: 1.2
 Rendering/Testing/Cxx/TestGenericVertexAttributesGLSLDepthPeelingPass.cxx new revision: 1.4; previous revision: 1.3
 Rendering/Testing/Cxx/TestTranslucentLUTDepthPeelingPass.cxx new revision: 1.2; previous revision: 1.1

When making a commit to VTK CVS HEAD that you will also want merged to a branch, please save the following information:

  • Commit your changes to CVS HEAD of VTK -- save the output of all cvs commits associated with your changes. This is critical for making corresponding merges on the release branch. Without this information, your patch will not be merged to the release branch.
  • Wait overnight until the dashboard results are in
  • If there are any problems on the dashboard, make changes to fix them and repeat from the "Commit" step
  • Send email to Zack Galbreath with "VTK-5-4 Merge Request" as the subject
  • Include your commit log comment and the cvs commit output for all your changes
Retrieved from "https://public.kitware.com/Wiki/index.php?title=VTK/Patch_Procedure&oldid=14981"