[Insight-developers] Gerrit: Failed to push (no new changes)

[Bill Lorensen]

OK, I just tried to make a trivial change to a file and push again.
This time it accepted the push, but I don't see my deleted files in
the patch.

Bill

On Mon, Oct 18, 2010 at 11:02 AM, Bill Lorensen <bill.lorensen at gmail.com> wrote:
> I think the problem is that when I first pushed it, I had uncommitted
> deleted files. I guess the push includes those uncommitted files? Once
> I commit them and try to push again, it does not recognize that the
> removed files have been commited.
>
>
>
> On Mon, Oct 18, 2010 at 10:54 AM, Marcus D. Hanwell
> <marcus.hanwell at kitware.com> wrote:
>> On Mon, Oct 18, 2010 at 10:46 AM, Bill Lorensen <bill.lorensen at gmail.com> wrote:
>>> Marcus,
>>>
>>> I created a topic branch, edited some files and removed some files. I
>>> committed my changes and pushed to gerrit.
>>>
>>> I noticed that my gerrit patch did not have the removed files. I guess
>>> I had forgotten to commit them.
>>>
>>> So, I abandoned that patch.
>>>
>>> Then I committed the removed files and renamed the branch and tried to
>>> push to gerrit.
>>>
>>> I get this error:
>>> $ git gerrit-push
>>> Counting objects: 9, done.
>>> Delta compression using up to 2 threads.
>>> Compressing objects: 100% (5/5), done.
>>> Writing objects: 100% (5/5), 712 bytes, done.
>>> Total 5 (delta 4), reused 0 (delta 0)
>>> To lorensen at review.source.kitware.com:ITK
>>>  ! [remote rejected] HEAD ->
>>> refs/for/master/RemoveOrientedImageExamples2 (no new changes)
>>> error: failed to push some refs to 'lorensen at review.source.kitware.com:ITK'
>>>
>>> But there are new changes. The second try has the removed files committed.
>>>
>>> Help
>>>
>> What does,
>>
>> git log --graph --stat origin/master..
>>
>> show? Gerrit is saying that it cannot see anything that is not already
>> either in master or up for review. If you paste the output of that
>> command I can look into what might be causing this.
>>
>> Thanks,
>>
>> Marcus
>>
>