<div dir="ltr">Kyle,<div><br></div><div style>is this commit basically a rebase on top of <span style="color:rgb(80,0,80);font-family:arial,sans-serif;font-size:13px">91e0850?</span></div><div style><span style="color:rgb(80,0,80);font-family:arial,sans-serif;font-size:13px">In that case the diff with the previous patchset would be empty.</span></div>
<div style><span style="color:rgb(80,0,80);font-family:arial,sans-serif;font-size:13px">I recall I had a similar issue; I just tweaked a comment line in my commit to let gerrit think it was a different patchset.</span></div>
<div style><span style="color:rgb(80,0,80);font-family:arial,sans-serif;font-size:13px"><br></span></div><div style><span style="color:rgb(80,0,80);font-family:arial,sans-serif;font-size:13px">Salvatore</span></div></div>
<div class="gmail_extra"><br><br><div class="gmail_quote">On 2 July 2013 23:05, Kyle Mestery (kmestery) <span dir="ltr"><<a href="mailto:kmestery@cisco.com" target="_blank">kmestery@cisco.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
On Jul 2, 2013, at 3:52 PM, Jeremy Stanley <<a href="mailto:fungi@yuggoth.org">fungi@yuggoth.org</a>><br>
<div class="im"> wrote:<br>
> On 2013-07-02 20:14:35 +0000 (+0000), Kyle Mestery (kmestery) wrote:<br>
>> I'm trying to submit a gerrit review for a commit which is<br>
>> dependent on another person's commit [1].<br>
> [...]<br>
>> ! [remote rejected] HEAD -> refs/publish/master/bp/ml2-vxlan (no changes made)<br>
> [...]<br>
><br>
> I want to say I've seen this recently when someone copy-pasted from<br>
> one commit message to another and included an existing Change-Id<br>
> header, so you might amend and clear that line from the top commit<br>
> before reviewing again (it'll get regenerated fresh).<br>
><br>
</div>Thanks Jeremy, this was it! For some reason, the top commit had the<br>
same Change-ID as the bottom commit. Once I cleared it, I was able to<br>
push, though with the issue seen here:<br>
<div class="im"><br>
[kmestery@fedora-mac quantum]$ git review -R<br>
You have more than one commit that you are about to submit.<br>
The outstanding commits are:<br>
<br>
</div>6cca2cf (HEAD, bp/ml2-vxlan) Add VXLAN tunneling support for the ML2 plugin<br>
<div class="im">91e0850 Add gre tunneling support for the ML2 plugin<br>
<br>
Is this really what you meant to do?<br>
Type 'yes' to confirm: yes<br>
Enter passphrase for key '/home/kmestery/.ssh/id_rsa':<br>
remote: Resolving deltas: 100% (32/32)<br>
</div>remote: Processing changes: new: 1, updated: 1, refs: 1, done<br>
remote:<br>
remote: New Changes:<br>
remote: <a href="https://review.openstack.org/35384" target="_blank">https://review.openstack.org/35384</a><br>
remote:<br>
To ssh://<a href="http://mestery@review.openstack.org:29418/openstack/quantum.git" target="_blank">mestery@review.openstack.org:29418/openstack/quantum.git</a><br>
<div class="im"> ! [remote rejected] HEAD -> refs/publish/master/bp/ml2-vxlan (no changes made)<br>
</div><div class="im">error: failed to push some refs to 'ssh://<a href="http://mestery@review.openstack.org:29418/openstack/quantum.git" target="_blank">mestery@review.openstack.org:29418/openstack/quantum.git</a>'<br>
[kmestery@fedora-mac quantum]$<br>
<br>
</div>In addition, my commit seen at the review URL above does not show<br>
the dependancy. Any ideas now?<br>
<br>
Thanks!<br>
Kyle<br>
<div class="im"><br>
> If that doesn't work, could you push your working branch to<br>
> somewhere I could pull from so I can test it myself? Feel free to<br>
> follow up with me in private or open a bug against git-review on<br>
> Launchpad if you don't want to run through troubleshooting<br>
</div>> back-and-forth on the list.o<br>
<div class="HOEnZb"><div class="h5"><br>
<br>
<br>
<br>
_______________________________________________<br>
OpenStack-dev mailing list<br>
<a href="mailto:OpenStack-dev@lists.openstack.org">OpenStack-dev@lists.openstack.org</a><br>
<a href="http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev" target="_blank">http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev</a><br>
</div></div></blockquote></div><br></div>