Open Stack

Hi Kyle,

I wonder if it works if you drop the -R ?

I've seen this error:

 ! [remote rejected] HEAD -> refs/publish/master/bp/ml2-vxlan (no changes
made)

if i try to push a change that has already been pushed and nothing has
changed. Any chance that may have happened?

Best,

Aaron



On Tue, Jul 2, 2013 at 1:14 PM, Kyle Mestery (kmestery)
<kmestery at cisco.com>wrote:

> I'm trying to submit a gerrit review for a commit which is dependent on
> another person's commit [1]. I've followed the instructions here [2], and
> had no problems doing the branch create and the cherry pick of both the
> dependent and my own commits. However, when I go to commit, I get a gerrit
> error. Trying again yielded another commit going to the dependent commit,
> likely because I had to rebase both my change and the dependent commit. Has
> anyone seen anything like this? The error I see is below:
>
> [kmestery at fedora-mac quantum]$ git review -R
> You have more than one commit that you are about to submit.
> The outstanding commits are:
>
> 5929516 (HEAD, bp/ml2-vxlan) Add VXLAN tunneling support for the ML2 plugin
> 91e0850 Add gre tunneling support for the ML2 plugin
>
> Is this really what you meant to do?
> Type 'yes' to confirm: yes
> Enter passphrase for key '/home/kmestery/.ssh/id_rsa':
> remote: Resolving deltas: 100% (32/32)
> remote: Processing changes: updated: 1, refs: 2, done
> To ssh://mestery@review.openstack.org:29418/openstack/quantum.git
>  ! [remote rejected] HEAD -> refs/publish/master/bp/ml2-vxlan (no changes
> made)
> error: failed to push some refs to 'ssh://
> mestery at review.openstack.org:29418/openstack/quantum.git'
> [kmestery at fedora-mac quantum]$
>
>
> Thanks,
> Kyle
>
> [1] https://review.openstack.org/#/c/33297/
> [2] https://wiki.openstack.org/wiki/Gerrit_Workflow
> _______________________________________________
> OpenStack-dev mailing list
> OpenStack-dev at lists.openstack.org
> http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openstack.org/pipermail/openstack-dev/attachments/20130702/319c943d/attachment.html>