[Insight-developers] Failed to merge a gerrit patch

[Matt McCormick]

Hi Bill,

This is intended behavior.  A 'git commit --amend' or a 'git rebase
master' will require a 'git gerrit-push' before a 'git gerrit-merge'
because they are no longer the same commit.

Thanks,
Matt

On Sun, Aug 14, 2011 at 3:53 PM, Bill Lorensen <bill.lorensen at gmail.com> wrote:
> This was a topic that was not mine.
>
> OK, so I did a git commit --amend and changed the commit message.
>
> I did a gerrit-push, followed by a gerrit-merge and it worked.
>
> I think there may be a flaw in the recently added git hooks.
>
> Bill
>
>
> On Sun, Aug 14, 2011 at 3:50 PM, Bill Lorensen <bill.lorensen at gmail.com>
> wrote:
>>
>> I tried to merge a gerrit patch today and got the error:
>>
>> gerrit-merge failure
>> --------------------
>>
>> Patch not found on Gerrit.
>>
>> Have you pushed your patch to Gerrit for review (git gerrit-push)?
>>
>> This is the topic:
>> http://review.source.kitware.com/#change,2464
>>
>> Bill
>>
>
>
> _______________________________________________
> 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
>
>