[Insight-developers] pre-commit hook woes
Daniel Blezek
Blezek.Daniel at mayo.edu
Wed Jul 6 15:27:06 EDT 2011
We¹ve been working on a topic branch for OpenMP support in ITK. Brad fixed
some things and suggested I merge master into our branch. However, there
are significant problems in the merge in files that we did not touch:
pre-commit hook failure
-----------------------
Modules/Segmentation/BioCell/include/itkBioCell.h:31: trailing whitespace.
+ *
Modules/Segmentation/BioCell/include/itkBioCellBase.h:32: trailing
whitespace.
+ *
Modules/Segmentation/BioCell/include/itkBioCellularAggregate.h:37: trailing
whitespace.
+ *
Modules/Segmentation/BioCell/include/itkBioCellularAggregateBase.h:32:
trailing whitespace.
+ * \brief Base class for the CellularAggregates.
Modules/Segmentation/BioCell/include/itkBioCellularAggregateBase.h:33:
trailing whitespace.
+ *
Modules/Segmentation/BioCell/include/itkBioGene.h:42: trailing whitespace.
+ *
When I fixed these, I then get this problem:
pre-commit hook failure
-----------------------
Documentation/Migration/RemovingBlox.xml:172: element MigrationFix-Manual:
validity error : Element MigrationFix-Manual content does not follow the
DTD, expecting (Old , New), got (CDATA)
Document Documentation/Migration/RemovingBlox.xml does not validate against
Documentation/Migration/ITKMigration.dtd
Questions:
1. How are these problems coming into the repo?
2. Can the responsible party fix them?
3. Can the pre-commit hook be run on the entire ITK source tree so we can
find other latent problems?
Thanks,
-dan
--
Daniel Blezek, PhD
Medical Imaging Informatics Innovation Center
P 127 or (77) 8 8886
T 507 538 8886
E blezek.daniel at mayo.edu
Mayo Clinic
200 First St. S.W.
Harwick SL-44
Rochester, MN 55905
mayoclinic.org
"It is more complicated than you think." -- RFC 1925
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.itk.org/mailman/private/insight-developers/attachments/20110706/cf2b95f2/attachment.htm>
More information about the Insight-developers
mailing list