[Insight-developers] Error when push second changes to gerrit

[Bradley Lowekamp]

Wanlin,

It sounds like you have 2 commits with the same ChageId? Are you intending to submit 2 commits for this topic to gerrit for this topic or are you trying to submit a new corrected one?

Brad

On Nov 21, 2010, at 9:15 AM, Bill Lorensen wrote:

> Wanlin,
> 
> Make sure that the change-id is the last line in the commit.
> 
> Bill
> 
> On Sun, Nov 21, 2010 at 6:22 AM, wanlin <wanlinzhu at gmail.com> wrote:
>> When making changes in uploaded changes, i input
>> git rebase -i HEAD~2
>> 
>> Two commits appear in the editor, i changed the second as edit
>> 
>> pick 18193dd Remove bug in
>> NeighborhoodAlgorithm::ImageBoundaryFacesCalculator
>> e 6bfb20c Remove bug in NeighborhoodAlgorithm::ImageBoundaryFacesCalculator
>> 
>> then ensure the second commit has the same change-ID with the first one. but
>> when i push them
>> 
>> git push gerrit HEAD:refs/for/master/NeighborhoodAlgorithm
>> 
>> It prompted the following error:
>> 
>>  ! [remote rejected] HEAD -> refs/for/master/NeighborhoodAlgorithm (squash
>> commits first)
>> error: failed to push some refs to 'wanlin at review.source.kitware.com:ITK'
>> 
>> _______________________________________________
>> 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
>> 
>> 
> _______________________________________________
> 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