I'm trying to check in some conversions that relate to the DoubleConversion 3rd Party library, namely establishing a framework for merging upstream changes. It's based on the strategy Brad King developed for the VXL library.
The changes are here: http://review.source.kitware.com/#/c/11085/ -- the initial merge from google's repo http://review.source.kitware.com/#/c/11086/ -- the actual merge, based on a git subtree merge. Now the second gerrit topic/branch depends on the first, and using gerrit-merge fails. I get this message: Counting objects: 25, done. Delta compression using up to 8 threads. Compressing objects: 100% (16/16), done. Writing objects: 100% (16/16), 14.83 KiB, done. Total 16 (delta 9), reused 0 (delta 0) ---------------------------------------------------------------------- root commit 0447797f not allowed ---------------------------------------------------------------------- error: hook declined to update refs/heads/DoubleConversion-update To [email protected]:stage/ITK.git ! [remote rejected] HEAD -> DoubleConversion-update (hook declined) error: failed to push some refs to '[email protected]:stage/ITK.git' What I conclude is that this kind of patch isn't something mere mortals can check in via git gerrit-merge. So I'm calling upon the gods of ITK to step in. I'm prepared to sacrifice a goat. -- Kent Williams [email protected] ________________________________ Notice: This UI Health Care e-mail (including attachments) is covered by the Electronic Communications Privacy Act, 18 U.S.C. 2510-2521, is confidential and may be legally privileged. If you are not the intended recipient, you are hereby notified that any retention, dissemination, distribution, or copying of this communication is strictly prohibited. Please reply to the sender that you have received the message in error, then delete it. Thank you. ________________________________
_______________________________________________ Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Kitware offers ITK Training Courses, for more information visit: http://kitware.com/products/protraining.php Please keep messages on-topic and check the ITK FAQ at: http://www.itk.org/Wiki/ITK_FAQ Follow this link to subscribe/unsubscribe: http://www.itk.org/mailman/listinfo/insight-developers
