Re: [ovirt-devel] Change in ovirt-engine[master]: core: backup flag added to storage domain static
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@ovirt.org> wrote:
From Eli Mesika <emesika@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@gmail.com> Gerrit-Reviewer: Eli Mesika <emesika@redhat.com> Gerrit-Reviewer: Greg Sheremeta <gshereme@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk@redhat.com> Gerrit-Reviewer: Martin Peřina <mperina@redhat.com> Gerrit-Reviewer: gerrit-hooks <automation@ovirt.org> Gerrit-HasComments: No
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@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@ovirt.org> wrote:
From Eli Mesika <emesika@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@gmail.com> Gerrit-Reviewer: Eli Mesika <emesika@redhat.com> Gerrit-Reviewer: Greg Sheremeta <gshereme@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk@redhat.com> Gerrit-Reviewer: Martin Peřina <mperina@redhat.com> Gerrit-Reviewer: gerrit-hooks <automation@ovirt.org> Gerrit-HasComments: No
# initial push git push gerrit.ovirt.org:ovirt-engine HEAD:refs/for/master # edit some text # amend the commit git add [files] git commit --amend # re-push git push gerrit.ovirt.org:ovirt-engine HEAD:refs/for/master On Tue, May 23, 2017 at 5:35 AM, Martin Perina <mperina@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@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@ovirt.org> wrote:
From Eli Mesika <emesika@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@gmail.com> Gerrit-Reviewer: Eli Mesika <emesika@redhat.com> Gerrit-Reviewer: Greg Sheremeta <gshereme@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk@redhat.com> Gerrit-Reviewer: Martin Peřina <mperina@redhat.com> Gerrit-Reviewer: gerrit-hooks <automation@ovirt.org> Gerrit-HasComments: No
_______________________________________________ Devel mailing list Devel@ovirt.org http://lists.ovirt.org/mailman/listinfo/devel
-- Greg Sheremeta, MBA Sr. Software Engineer Red Hat, Inc. gshereme@redhat.com
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@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@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@ovirt.org> wrote:
From Eli Mesika <emesika@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@gmail.com> Gerrit-Reviewer: Eli Mesika <emesika@redhat.com> Gerrit-Reviewer: Greg Sheremeta <gshereme@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk@redhat.com> Gerrit-Reviewer: Martin Peřina <mperina@redhat.com> Gerrit-Reviewer: gerrit-hooks <automation@ovirt.org> Gerrit-HasComments: No
You cannot, but for future you need have the same Change-Id for a patch, this is how gerrit identifies patches. On Tue, May 23, 2017 at 11:43 AM, shubham dubey <sdubey504@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@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@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@ovirt.org> wrote:
From Eli Mesika <emesika@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@gmail.com> Gerrit-Reviewer: Eli Mesika <emesika@redhat.com> Gerrit-Reviewer: Greg Sheremeta <gshereme@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk@redhat.com> Gerrit-Reviewer: Martin Peřina <mperina@redhat.com> Gerrit-Reviewer: gerrit-hooks <automation@ovirt.org> Gerrit-HasComments: No
On Tue, May 23, 2017 at 11:47 AM, Martin Perina <mperina@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@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@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@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@ovirt.org> wrote:
From Eli Mesika <emesika@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@gmail.com> Gerrit-Reviewer: Eli Mesika <emesika@redhat.com> Gerrit-Reviewer: Greg Sheremeta <gshereme@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk@redhat.com> Gerrit-Reviewer: Martin Peřina <mperina@redhat.com> Gerrit-Reviewer: gerrit-hooks <automation@ovirt.org> Gerrit-HasComments: No
So,what I do for now? Can I can now add the new file to previous change? On Tue, May 23, 2017 at 3:17 PM, Martin Perina <mperina@redhat.com> wrote:
You cannot, but for future you need have the same Change-Id for a patch, this is how gerrit identifies patches.
On Tue, May 23, 2017 at 11:43 AM, shubham dubey <sdubey504@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@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@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@ovirt.org> wrote:
From Eli Mesika <emesika@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@gmail.com> Gerrit-Reviewer: Eli Mesika <emesika@redhat.com> Gerrit-Reviewer: Greg Sheremeta <gshereme@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk@redhat.com> Gerrit-Reviewer: Martin Peřina <mperina@redhat.com> Gerrit-Reviewer: gerrit-hooks <automation@ovirt.org> Gerrit-HasComments: No
Done. They are not coming in single page but in related changes. Thanks On Tue, May 23, 2017 at 3:21 PM, shubham dubey <sdubey504@gmail.com> wrote:
So,what I do for now? Can I can now add the new file to previous change?
On Tue, May 23, 2017 at 3:17 PM, Martin Perina <mperina@redhat.com> wrote:
You cannot, but for future you need have the same Change-Id for a patch, this is how gerrit identifies patches.
On Tue, May 23, 2017 at 11:43 AM, shubham dubey <sdubey504@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@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@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@ovirt.org> wrote:
From Eli Mesika <emesika@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@gmail.com> Gerrit-Reviewer: Eli Mesika <emesika@redhat.com> Gerrit-Reviewer: Greg Sheremeta <gshereme@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Maor Lipchuk <mlipchuk@redhat.com> Gerrit-Reviewer: Martin Peřina <mperina@redhat.com> Gerrit-Reviewer: gerrit-hooks <automation@ovirt.org> Gerrit-HasComments: No
Please merge upgrade script into previous patch, otherwise CI will always fail for your patch On Tue, May 23, 2017 at 11:57 AM, shubham dubey <sdubey504@gmail.com> wrote:
Done. They are not coming in single page but in related changes.
Thanks
On Tue, May 23, 2017 at 3:21 PM, shubham dubey <sdubey504@gmail.com> wrote:
So,what I do for now? Can I can now add the new file to previous change?
On Tue, May 23, 2017 at 3:17 PM, Martin Perina <mperina@redhat.com> wrote:
You cannot, but for future you need have the same Change-Id for a patch, this is how gerrit identifies patches.
On Tue, May 23, 2017 at 11:43 AM, shubham dubey <sdubey504@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@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@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@ovirt.org> wrote:
> From Eli Mesika <emesika@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@gmail.com> > Gerrit-Reviewer: Eli Mesika <emesika@redhat.com> > Gerrit-Reviewer: Greg Sheremeta <gshereme@redhat.com> > Gerrit-Reviewer: Jenkins CI > Gerrit-Reviewer: Maor Lipchuk <mlipchuk@redhat.com> > Gerrit-Reviewer: Martin Peřina <mperina@redhat.com> > Gerrit-Reviewer: gerrit-hooks <automation@ovirt.org> > Gerrit-HasComments: No >
I have run 'git rebase -i HEAD~2' but they doesn't merge. I think I need to change pick with edit for merging but I didn't do that, thats why they are still separate commit. On Tue, May 23, 2017 at 3:37 PM, Martin Perina <mperina@redhat.com> wrote:
Please merge upgrade script into previous patch, otherwise CI will always fail for your patch
On Tue, May 23, 2017 at 11:57 AM, shubham dubey <sdubey504@gmail.com> wrote:
Done. They are not coming in single page but in related changes.
Thanks
On Tue, May 23, 2017 at 3:21 PM, shubham dubey <sdubey504@gmail.com> wrote:
So,what I do for now? Can I can now add the new file to previous change?
On Tue, May 23, 2017 at 3:17 PM, Martin Perina <mperina@redhat.com> wrote:
You cannot, but for future you need have the same Change-Id for a patch, this is how gerrit identifies patches.
On Tue, May 23, 2017 at 11:43 AM, shubham dubey <sdubey504@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@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@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@ovirt.org> > wrote: > >> From Eli Mesika <emesika@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@gmail.com> >> Gerrit-Reviewer: Eli Mesika <emesika@redhat.com> >> Gerrit-Reviewer: Greg Sheremeta <gshereme@redhat.com> >> Gerrit-Reviewer: Jenkins CI >> Gerrit-Reviewer: Maor Lipchuk <mlipchuk@redhat.com> >> Gerrit-Reviewer: Martin Peřina <mperina@redhat.com> >> Gerrit-Reviewer: gerrit-hooks <automation@ovirt.org> >> Gerrit-HasComments: No >> > >
After git rebase -i, you need to edit the line of the newer commit to be: squash <SHA1> <commit message> instead of: pick <SHA1> <commit message> On Tue, May 23, 2017 at 1:18 PM, shubham dubey <sdubey504@gmail.com> wrote:
I have run 'git rebase -i HEAD~2' but they doesn't merge. I think I need to change pick with edit for merging but I didn't do that, thats why they are still separate commit.
On Tue, May 23, 2017 at 3:37 PM, Martin Perina <mperina@redhat.com> wrote:
Please merge upgrade script into previous patch, otherwise CI will always fail for your patch
On Tue, May 23, 2017 at 11:57 AM, shubham dubey <sdubey504@gmail.com> wrote:
Done. They are not coming in single page but in related changes.
Thanks
On Tue, May 23, 2017 at 3:21 PM, shubham dubey <sdubey504@gmail.com> wrote:
So,what I do for now? Can I can now add the new file to previous change?
On Tue, May 23, 2017 at 3:17 PM, Martin Perina <mperina@redhat.com> wrote:
You cannot, but for future you need have the same Change-Id for a patch, this is how gerrit identifies patches.
On Tue, May 23, 2017 at 11:43 AM, shubham dubey <sdubey504@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@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@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@ovirt.org> >> wrote: >> >>> From Eli Mesika <emesika@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@gmail.com> >>> Gerrit-Reviewer: Eli Mesika <emesika@redhat.com> >>> Gerrit-Reviewer: Greg Sheremeta <gshereme@redhat.com> >>> Gerrit-Reviewer: Jenkins CI >>> Gerrit-Reviewer: Maor Lipchuk <mlipchuk@redhat.com> >>> Gerrit-Reviewer: Martin Peřina <mperina@redhat.com> >>> Gerrit-Reviewer: gerrit-hooks <automation@ovirt.org> >>> Gerrit-HasComments: No >>> >> >> >
_______________________________________________ Devel mailing list Devel@ovirt.org http://lists.ovirt.org/mailman/listinfo/devel
participants (4)
-
Gil Shinar -
Greg Sheremeta -
Martin Perina -
shubham dubey