[Engine-devel] Rebasing a patch on an updated dependency
Hi All, I have a patch, http://gerrit.ovirt.org/#/c/11783/, that is dependent on another unmerged patch and the dependent patch has been updated with a new patch set. I know I need to somehow rebase my patch on the updated dependent patch set, but I'm new to git and gerrit and have not been able to figure out the right combination of git commands to accomplish this. Any ideas on what steps I need to take? Thanks! -Chris Chris Morrissey Software Engineer NetApp Inc. 919.476.4428
Hi Chris, how are you? You can do that using git commands, but the easiest way to rebase would be to go to the gerrit UI, and press the "rebase change" button. Then, you can verify it using the "checkout command" that gerrit would give you (the command appears above the "rebase change" button), in your git repository. btw, why is the patch it depends on not merged yet? do you need to verify them together before merging it? Because I saw it is acked, so if it is also verified then we can merge it. Hope I helped, Oved ----- Original Message -----
From: "Christopher Morrissey" <Christopher.Morrissey@netapp.com> To: engine-devel@ovirt.org Sent: Wednesday, February 27, 2013 8:38:18 PM Subject: [Engine-devel] Rebasing a patch on an updated dependency
Hi All,
I have a patch, http://gerrit.ovirt.org/#/c/11783/, that is dependent on another unmerged patch and the dependent patch has been updated with a new patch set. I know I need to somehow rebase my patch on the updated dependent patch set, but I'm new to git and gerrit and have not been able to figure out the right combination of git commands to accomplish this. Any ideas on what steps I need to take? Thanks!
-Chris
Chris Morrissey Software Engineer NetApp Inc. 919.476.4428
_______________________________________________ Engine-devel mailing list Engine-devel@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-devel
Thanks Oved! That's what I needed. -Chris
-----Original Message----- From: Oved Ourfalli [mailto:ovedo@redhat.com] Sent: Wednesday, February 27, 2013 3:05 PM To: Morrissey, Christopher Cc: engine-devel@ovirt.org Subject: Re: [Engine-devel] Rebasing a patch on an updated dependency
Hi Chris, how are you?
You can do that using git commands, but the easiest way to rebase would be to go to the gerrit UI, and press the "rebase change" button. Then, you can verify it using the "checkout command" that gerrit would give you (the command appears above the "rebase change" button), in your git repository.
btw, why is the patch it depends on not merged yet? do you need to verify them together before merging it? Because I saw it is acked, so if it is also verified then we can merge it.
Hope I helped, Oved
----- Original Message -----
From: "Christopher Morrissey" <Christopher.Morrissey@netapp.com> To: engine-devel@ovirt.org Sent: Wednesday, February 27, 2013 8:38:18 PM Subject: [Engine-devel] Rebasing a patch on an updated dependency
Hi All,
I have a patch, http://gerrit.ovirt.org/#/c/11783/, that is dependent on another unmerged patch and the dependent patch has been updated with a new patch set. I know I need to somehow rebase my patch on the updated dependent patch set, but I'm new to git and gerrit and have not been able to figure out the right combination of git commands to accomplish this. Any ideas on what steps I need to take? Thanks!
-Chris
Chris Morrissey Software Engineer NetApp Inc. 919.476.4428
_______________________________________________ Engine-devel mailing list Engine-devel@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-devel
participants (2)
-
Morrissey, Christopher -
Oved Ourfalli