[ovirt-devel] Change in ovirt-engine[master]: core: backup flag added to storage domain static

[Martin Perina]

On Tue, May 23, 2017 at 11:47 AM, Martin Perina <mperina at redhat.com> wrote:

> You cannot, but for future you need have the same Change-Id for a patch,
> this is how gerrit identifies patches.
>

​Ahh now I see your issue, you have created a new patch in your git locally
instead of ammending the previous one.
So you can following:

1. 2 patches locally​

​using 'git rebase -i HEAD~2​' and selecting fixup for newer patch
2. Push again to gerrit
3. Abandon https://gerrit.ovirt.org/77154 in gerrit

More info at https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History


> On Tue, May 23, 2017 at 11:43 AM, shubham dubey <sdubey504 at gmail.com>
> wrote:
>
>> I just use 'git push origin HEAD:refs/for/master'
>> but it comes as new commit.
>>
>> How I merge both?
>>
>> On Tue, May 23, 2017 at 3:05 PM, Martin Perina <mperina at redhat.com>
>> wrote:
>>
>>> Just add a file into the patch locally and push it again to gerrit,
>>> patch will be stored as new patch set.
>>>
>>> On Tue, May 23, 2017 at 11:33 AM, shubham dubey <sdubey504 at gmail.com>
>>> wrote:
>>>
>>>> yes I just forget to add that.
>>>> Can anyone tell me how to push the new changes to same commit?
>>>>
>>>> Thanks,
>>>> Shubham
>>>>
>>>> On Tue, May 23, 2017 at 1:27 PM, Code Review <gerrit at ovirt.org> wrote:
>>>>
>>>>> From Eli Mesika <emesika at redhat.com>:
>>>>>
>>>>> Eli Mesika has posted comments on this change.
>>>>>
>>>>> Change subject: core: backup flag added to storage domain static
>>>>> ......................................................................
>>>>>
>>>>>
>>>>> Patch Set 1:
>>>>>
>>>>> Did you forgot to add the relevant upgrade script that added that
>>>>> field ????
>>>>>
>>>>> --
>>>>> To view, visit https://gerrit.ovirt.org/77142
>>>>> To unsubscribe, visit https://gerrit.ovirt.org/settings
>>>>>
>>>>> Gerrit-MessageType: comment
>>>>> Gerrit-Change-Id: I1453b52f4330d0e5cb12d8fa08426fd68f3cd329
>>>>> Gerrit-PatchSet: 1
>>>>> Gerrit-Project: ovirt-engine
>>>>> Gerrit-Branch: master
>>>>> Gerrit-Owner: shubham dubey <sdubey504 at gmail.com>
>>>>> Gerrit-Reviewer: Eli Mesika <emesika at redhat.com>
>>>>> Gerrit-Reviewer: Greg Sheremeta <gshereme at redhat.com>
>>>>> Gerrit-Reviewer: Jenkins CI
>>>>> Gerrit-Reviewer: Maor Lipchuk <mlipchuk at redhat.com>
>>>>> Gerrit-Reviewer: Martin Peřina <mperina at redhat.com>
>>>>> Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>
>>>>> Gerrit-HasComments: No
>>>>>
>>>>
>>>>
>>>
>>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.ovirt.org/pipermail/devel/attachments/20170523/f6fd371b/attachment-0001.html>