Fascinating. Now when I went to work on a branch based off of master, it still complained that there was already an interactive rebase already started. I did the git rebase --continue and then git review and managed to get two new changes ready for review. I'm not sure that was my intent but I'm reporting back what happened. Here's a paste.
M60L7XJ:openstack-manuals anne.gentle$ git commit -a -m 'Adds xen example nova conf file and references hypervisor chapter for configuration'
[xenserver c83c90b] Adds xen example nova conf file and references hypervisor chapter for configuration
2 files changed, 3 insertions(+), 21 deletions(-)
M60L7XJ:openstack-manuals anne.gentle$ git review
Errors running GIT_EDITOR=true git rebase -i remotes/gerrit/master
Interactive rebase already started
M60L7XJ:openstack-manuals anne.gentle$ git rebase --continue
Successfully rebased and updated refs/heads/newcherrypick.
M60L7XJ:openstack-manuals anne.gentle$ git review
remote: Resolving deltas: 0% (0/10)
remote: (W) a2d5eae: commit subject >50 characters; use shorter first paragraph
remote: (W) a2d5eae: commit message lines >70 characters; manually wrap lines
remote:
remote: New Changes:
remote: https://review.openstack.org/1264
remote: https://review.openstack.org/1265
remote:
To ssh://<email address hidden>:29418/openstack/openstack-manuals.git
* [new branch] HEAD -> refs/for/master/newcherrypick
It's as if the git review step took my branch based on master and my branch based on stable/diablo and committed them both at once?
Both changes are fine, but one is dependent on the other.
How can I learn more about what git review does precisely so I can untangle this?
Fascinating. Now when I went to work on a branch based off of master, it still complained that there was already an interactive rebase already started. I did the git rebase --continue and then git review and managed to get two new changes ready for review. I'm not sure that was my intent but I'm reporting back what happened. Here's a paste.
M60L7XJ: openstack- manuals anne.gentle$ git commit -a -m 'Adds xen example nova conf file and references hypervisor chapter for configuration' openstack- manuals anne.gentle$ git review gerrit/ master openstack- manuals anne.gentle$ git rebase --continue newcherrypick. openstack- manuals anne.gentle$ git review /review. openstack. org/1264 /review. openstack. org/1265 :29418/ openstack/ openstack- manuals. git master/ newcherrypick
[xenserver c83c90b] Adds xen example nova conf file and references hypervisor chapter for configuration
2 files changed, 3 insertions(+), 21 deletions(-)
M60L7XJ:
Errors running GIT_EDITOR=true git rebase -i remotes/
Interactive rebase already started
M60L7XJ:
Successfully rebased and updated refs/heads/
M60L7XJ:
remote: Resolving deltas: 0% (0/10)
remote: (W) a2d5eae: commit subject >50 characters; use shorter first paragraph
remote: (W) a2d5eae: commit message lines >70 characters; manually wrap lines
remote:
remote: New Changes:
remote: https:/
remote: https:/
remote:
To ssh://<email address hidden>
* [new branch] HEAD -> refs/for/
It's as if the git review step took my branch based on master and my branch based on stable/diablo and committed them both at once?
Both changes are fine, but one is dependent on the other.
How can I learn more about what git review does precisely so I can untangle this?