[Insight-developers] Could not submit gerrit patch now?

Tue Sep 13 12:29:02 EDT 2011

I think there could/should be a 'gerrit-patch-package' macro that would
figure out what the local changes are and squash them.

On 9/12/11 7:11 PM, "gang song" <songgang97 at gmail.com> wrote:

>Thanks for explanation!
>
>On Mon, Sep 12, 2011 at 3:16 PM, David Cole <david.cole at kitware.com>
>wrote:
>> Every commit becomes a separate gerrit patch. So if you only want a
>> single gerrit patch, for now, you should squash it into a single
>> commit.
>>
>> Eventually, (we hope) gerrit will support topic branches in a better
>> way than a million different patch sets, but until that happens
>> there's a one-to-one correspondence between git commits and gerrit
>> patch sets. Each unique one needs its own Change-Id.
>>
>>
>> HTH,
>> David
>>
>>
>> On Mon, Sep 12, 2011 at 3:11 PM, gang song <songgang97 at gmail.com> wrote:
>>> Hi,
>>>
>>> Sorry for losing the track a little, just back from a trip.
>>>
>>> David's method works. After removing the change-id line, I now pushed
>>> to gerrit. Thanks very much!
>>>
>>> Yes, I abandon those three patches. Those three patches seem to
>>> corresponding to three commits in my topic branch. I had thought that
>>> they should appear as one single gerrit patch, but only to find they
>>> showed as three patches. Then I abandoned these three patches and try
>>> to squash the three commits into one, use git rebase -i HEAD~3. And
>>> then I found I couldn't submit this patch. So I guess the change id
>>> was same as the abandoned patch.
>>>
>>> So my further question is: should I squash all the commits in my topic
>>> branch even for the first time gerrit push now?
>>>
>>>
>>> Thanks
>>>
>>> -Gang
>>>
>>>
>>>
>>>
>>> On Thu, Sep 8, 2011 at 6:36 PM, Matt McCormick
>>> <matt.mccormick at kitware.com> wrote:
>>>> On Thu, Sep 8, 2011 at 6:27 PM, David Cole <david.cole at kitware.com>
>>>>wrote:
>>>>> I don't see that button. Is it only available for *my* changes that
>>>>> have been abandoned...? (And I'm not allowed to see it on other
>>>>> people's changes?)
>>>>
>>>> Possibly.
>>>>
>>>> Something is wrong with Gang's changes.  There are three abandoned
>>>> patches with the same topic name but different Change-Id's all
>>>> submitted at the same time.
>>>>
>>>> Gang, did you abandon these patches?
>>>>
>>>>>
>>>>>
>>>>> On Thu, Sep 8, 2011 at 6:09 PM, Matt McCormick
>>>>> <matt.mccormick at kitware.com> wrote:
>>>>>> To the right of the 'Review' button.
>>>>>>
>>>>>> On Thu, Sep 8, 2011 at 5:54 PM, David Cole <david.cole at kitware.com>
>>>>>>wrote:
>>>>>>> Can you describe where that is? I was looking for it and could not
>>>>>>>find it...
>>>>>>>
>>>>>>>
>>>>>>> On Thu, Sep 8, 2011 at 5:44 PM, Matt McCormick
>>>>>>> <matt.mccormick at kitware.com> wrote:
>>>>>>>> There is also a 'Restore Change' button in the web interface.
>>>>>>>>
>>>>>>>> Matt
>>>>>>>>
>>>>>>>> On Thu, Sep 8, 2011 at 5:34 PM, David Cole
>>>>>>>><david.cole at kitware.com> wrote:
>>>>>>>>> A work-around would be to do:
>>>>>>>>>
>>>>>>>>> git commit --amend
>>>>>>>>>
>>>>>>>>> and delete the existing Change-Id: line.
>>>>>>>>>
>>>>>>>>> The commit hook should add a new Change-Id: line back in there
>>>>>>>>>after
>>>>>>>>> your edit. (Do the "git show | grep Change" again to verify.)
>>>>>>>>>
>>>>>>>>> Then try the push again, and it should open up a new gerrit
>>>>>>>>>topic with
>>>>>>>>> your branch name.
>>>>>>>>>
>>>>>>>>>
>>>>>>>>> HTH,
>>>>>>>>> David
>>>>>>>>>
>>>>>>>>>
>>>>>>>>> On Thu, Sep 8, 2011 at 5:21 PM, gang song <songgang97 at gmail.com>
>>>>>>>>>wrote:
>>>>>>>>>> Hi David,
>>>>>>>>>>
>>>>>>>>>> Yes, I am trying to re-open this change (removed several
>>>>>>>>>>debugging
>>>>>>>>>> print out, etc).
>>>>>>>>>>> Gang, your error message says:
>>>>>>>>>>>
>>>>>>>>>>>> !       HEAD:refs/for/master/RunLengthMatrixImplementationFix
>>>>>>>>>>>>  [remote
>>>>>>>>>>>> rejected] (change 2734 closed)
>>>>>>>>>>>
>>>>>>>>>>>
>>>>>>>>>>> Are you trying to extend and re-open this abandoned gerrit
>>>>>>>>>>>change?
>>>>>>>>>>> http://review.source.kitware.com/#change,2734
>>>>>>>>>>>
>>>>>>>>>>
>>>>>>>>>>> $ git show | grep Change-Id
>>>>>>>>>> Here is the change id:
>>>>>>>>>>
>>>>>>>>>>    Change-Id: I2aec556dd43339ade9c1a84fa434bc62b9b302c1
>>>>>>>>>>
>>>>>>>>>> It looks the same as the change id in the abandoned patch.  Is
>>>>>>>>>>there
>>>>>>>>>> some way to get around of this?
>>>>>>>>>>
>>>>>>>>>>
>>>>>>>>>> Thanks
>>>>>>>>>>
>>>>>>>>>> -Gang
>>>>>>>>>>
>>>>>>>>>>
>>>>>>>>>>
>>>>>>>>>> On Thu, Sep 8, 2011 at 5:09 PM, David Cole
>>>>>>>>>><david.cole at kitware.com> wrote:
>>>>>>>>>>> gerrit is not on public.kitware.com... So slowness on public
>>>>>>>>>>>should
>>>>>>>>>>> have no bearing on gerrit push operations.
>>>>>>>>>>>
>>>>>>>>>>>
>>>>>>>>>>> Gang, your error message says:
>>>>>>>>>>>
>>>>>>>>>>>> !       HEAD:refs/for/master/RunLengthMatrixImplementationFix
>>>>>>>>>>>>  [remote
>>>>>>>>>>>> rejected] (change 2734 closed)
>>>>>>>>>>>
>>>>>>>>>>>
>>>>>>>>>>> Are you trying to extend and re-open this abandoned gerrit
>>>>>>>>>>>change?
>>>>>>>>>>> http://review.source.kitware.com/#change,2734
>>>>>>>>>>>
>>>>>>>>>>> Or are you trying to make a new one?
>>>>>>>>>>>
>>>>>>>>>>> What is the "Change-id:" line at the bottom of your git commit
>>>>>>>>>>>message?
>>>>>>>>>>>
>>>>>>>>>>> $ git show | grep Change-Id
>>>>>>>>>>>
>>>>>>>>>>>
>>>>>>>>>>> Let us know, thanks,
>>>>>>>>>>> David C.
>>>>>>>>>>>
>>>>>>>>>>>
>>>>>>>>>>> On Thu, Sep 8, 2011 at 4:57 PM, Bradley Lowekamp
>>>>>>>>>>><blowekamp at mail.nih.gov> wrote:
>>>>>>>>>>>> I was using the public stage to merge a topic into SimpleITK
>>>>>>>>>>>>and to took
>>>>>>>>>>>> ~10minŠ I think the public.kitware.com server is/was unhappy.
>>>>>>>>>>>> Brad
>>>>>>>>>>>>
>>>>>>>>>>>> ========================================================
>>>>>>>>>>>>
>>>>>>>>>>>> Bradley Lowekamp
>>>>>>>>>>>>
>>>>>>>>>>>> Lockheed Martin Contractor for
>>>>>>>>>>>>
>>>>>>>>>>>> Office of High Performance Computing and Communications
>>>>>>>>>>>>
>>>>>>>>>>>> National Library of Medicine
>>>>>>>>>>>>
>>>>>>>>>>>> blowekamp at mail.nih.gov
>>>>>>>>>>>>
>>>>>>>>>>>> On Sep 8, 2011, at 4:47 PM, gang song wrote:
>>>>>>>>>>>>
>>>>>>>>>>>> Hi guys,
>>>>>>>>>>>>
>>>>>>>>>>>> I just tried twice to submit a gerrit patch without success.
>>>>>>>>>>>>Tried to
>>>>>>>>>>>> check out a new branch, add a new commit and do a
>>>>>>>>>>>>gerrit-push, got
>>>>>>>>>>>> this error:
>>>>>>>>>>>>
>>>>>>>>>>>> $ git gerrit-push
>>>>>>>>>>>> Fetching gerrit master
>>>>>>>>>>>> Pushing to gerrit
>>>>>>>>>>>> Counting objects: 23, done.
>>>>>>>>>>>> Delta compression using up to 7 threads.
>>>>>>>>>>>> Compressing objects: 100% (12/12), done.
>>>>>>>>>>>> Writing objects: 100% (12/12), 3.26 KiB, done.
>>>>>>>>>>>> Total 12 (delta 11), reused 0 (delta 0)
>>>>>>>>>>>> remote: Resolving deltas:   0% (0/11)
>>>>>>>>>>>> error: failed to push some refs to
>>>>>>>>>>>>'songgang at review.source.kitware.com:ITK'
>>>>>>>>>>>> To songgang at review.source.kitware.com:ITK
>>>>>>>>>>>> !       HEAD:refs/for/master/RunLengthMatrixImplementationFix
>>>>>>>>>>>>  [remote
>>>>>>>>>>>> rejected] (change 2734 closed)
>>>>>>>>>>>>
>>>>>>>>>>>>
>>>>>>>>>>>> Does anyone got similar problem?
>>>>>>>>>>>>
>>>>>>>>>>>> Thanks
>>>>>>>>>>>>
>>>>>>>>>>>> -Gang
>>>>>>>>>>>> _______________________________________________
>>>>>>>>>>>> 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
>>>>>>>>>>>>
>>>>>>>>>>>>
>>>>>>>>>>>
>>>>>>>>>>
>>>>>>>>> _______________________________________________
>>>>>>>>> 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

________________________________
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.
________________________________