[Insight-developers] Problem pushing to gerrit

[Bradley Lowekamp]

Hello Marcus,

This morning I was able to commit the topic. When I re-looked at the history I saw an errant merge. I just cherry-picked the gerrit commit, onto a new branch from master and then things were able to "gerrit-push" it ok.

I may have dopily committed a patch to my master before a pull, so something similar with out realizing. 

Needless to say the error message was not helpful.

Brad

On Jun 24, 2011, at 12:06 PM, Marcus D. Hanwell wrote:

> Hi Bradley,
> 
> Could you put this commit on the stage, Github or similar? I would
> like to pull the squashed commit and take a look, I might be able to
> try to push locally and see what is happening in the Gerrit logs too.
> 
> Thanks,
> 
> Marcus
> 
> On Thu, Jun 23, 2011 at 10:20 PM, Bradley Lowekamp
> <blowekamp at mail.nih.gov> wrote:
>> Hello David,
>> 
>> Here us the output requested:
>> 
>> $ git log -1
>> commit 51aa803c34ea26a950d140fd2ac8175fed0821b9
>> Author: Bradley Lowekamp <blowekamp at mail.nih.gov>
>> Date:   Thu Jun 23 16:39:16 2011 -0400
>> 
>>    WIP: Starting of refactoring the streaming base classes
>> 
>>    ENH: Adding StreamingProcessObject and ImageSink
>> 
>>    These new classes implement an common streaming pipeline, and a filter
>>    base class for those processes which consume images.
>> 
>>    ENH: converted LabelStatistics to ImageSink base
>> 
>>    The enables this class to drive the data pipeline and perform
>>    out-of-core processing.
>> 
>>    ENH: made ProcessObject::UpdateLargestPossibleRegion can PO::Update
>> 
>>    This enbles the overloaded StreamingProcess object to work with this
>>    method.
>> 
>>    ENH: ImageSink::Update should always run when update is called
>> 
>>    ENH: made ImageStatistics a streamed ImageSinc
>> 
>>    Change-Id: I5c8d06d140fee84808061cce0af2de533f0e8909
>> 
>> I was on a branch, and squashed things. Removed all but the last Change-Id and I got this error message when I performed "git gerrit-push" so I did the manual push but still got the same error as below. I then deleted the Change-Id and the the commit hooks add it again with the same results.
>> 
>> Any idea what may be causing this error?
>> 
>> Brad
>> 
>> 
>> On Jun 23, 2011, at 6:21 PM, David Cole wrote:
>> 
>>> On Thu, Jun 23, 2011 at 5:47 PM, Bradley Lowekamp
>>> <blowekamp at mail.nih.gov> wrote:
>>>> 
>>>> Hello,
>>>> I pushed to gerrit OK at 2:18, but now I am getting an odd error. I went down to the raw command to verify:
>>>> $ git push gerrit HEAD:refs/for/master/GerritStreamingRefactoring
>>>> Counting objects: 344, done.
>>>> Delta compression using up to 24 threads.
>>>> Compressing objects: 100% (133/133), done.
>>>> Writing objects: 100% (227/227), 47.76 KiB, done.
>>>> Total 227 (delta 107), reused 191 (delta 86)
>>>> remote: Resolving deltas:   5% (6/107)
>>>> To blowekamp at review.source.kitware.com:ITK
>>>>  ! [remote rejected] HEAD -> refs/for/master/GerritStreamingRefactoring (change 1946 closed)
>>>> error: failed to push some refs to 'blowekamp at review.source.kitware.com:ITK'
>>>> 
>>>> Thanks and good night,
>>>> Brad
>>>> 
>>>> ========================================================
>>>> 
>>>> Bradley Lowekamp
>>>> 
>>>> Lockheed Martin Contractor for
>>>> 
>>>> Office of High Performance Computing and Communications
>>>> 
>>>> National Library of Medicine
>>>> 
>>>> blowekamp at mail.nih.gov
>>>> 
>>>> 
>>>> _______________________________________________
>>>> 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.html
>>>> 
>>>> 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
>>>> 
>>> 
>>> What does "git log -1" report?
>>> Is there a gerrit change id in the commit message?
>>> 
>>> The change id for "change 1946" in gerrit is "Change-Id:
>>> I6e1ce961d1a0e92994047ff214d052268d126437"
>>> 
>>>  ( see here : http://review.source.kitware.com/#change,1946 )
>>> 
>>> 
>>> Marcus, is there anything else we have to setup in order to push git
>>> commits to the SimpleITK gerrit...?
>>> 
>>> 
>>> Thanks,
>>> David
>> 
>> 

========================================================
Bradley Lowekamp  
Lockheed Martin Contractor for
Office of High Performance Computing and Communications
National Library of Medicine 
blowekamp at mail.nih.gov


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.itk.org/mailman/private/insight-developers/attachments/20110624/1b171bc6/attachment.htm>