Open Stack

Kyle,

I actually meant that this problem might occur if patchset 2, that you're
trying to push, is a rebase of patchset 1 on top of another patch in order
to make the commit dependent on another one. If that is the case, gerrit
won't see any difference between patchset2 and patchset1, as git diff
HEAD~1 would be the same in both cases.

If this however is not your problem just disregard this post.

Salvatore


On 2 July 2013 23:29, Kyle Mestery (kmestery) <kmestery at cisco.com> wrote:

> On Jul 2, 2013, at 4:18 PM, Salvatore Orlando <sorlando at nicira.com> wrote:
> >
> > Kyle,
> >
> > is this commit basically a rebase on top of 91e0850?
> > In that case the diff with the previous patchset would be empty.
> > 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.
> >
> > Salvatore
> >
> Hi Salvatore:
>
> Actually, no. 91e0850 is actually the implementation for bp/ml2-gre,
> and my commit implements bp/ml2-vxlan. Since there was some
> shared code, the first commit implemented that, thus requiring my
> commit to be dependent on this other commit.
>
> Thanks,
> Kyle
>
> >
> > On 2 July 2013 23:05, Kyle Mestery (kmestery) <kmestery at cisco.com>
> wrote:
> > On Jul 2, 2013, at 3:52 PM, Jeremy Stanley <fungi at yuggoth.org>
> >  wrote:
> > > On 2013-07-02 20:14:35 +0000 (+0000), Kyle Mestery (kmestery) wrote:
> > >> I'm trying to submit a gerrit review for a commit which is
> > >> dependent on another person's commit [1].
> > > [...]
> > >> ! [remote rejected] HEAD -> refs/publish/master/bp/ml2-vxlan (no
> changes made)
> > > [...]
> > >
> > > I want to say I've seen this recently when someone copy-pasted from
> > > one commit message to another and included an existing Change-Id
> > > header, so you might amend and clear that line from the top commit
> > > before reviewing again (it'll get regenerated fresh).
> > >
> > Thanks Jeremy, this was it! For some reason, the top commit had the
> > same Change-ID as the bottom commit. Once I cleared it, I was able to
> > push, though with the issue seen here:
> >
> > [kmestery at fedora-mac quantum]$ git review -R
> > You have more than one commit that you are about to submit.
> > The outstanding commits are:
> >
> > 6cca2cf (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: new: 1, updated: 1, refs: 1, done
> > remote:
> > remote: New Changes:
> > remote:   https://review.openstack.org/35384
> > remote:
> > 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]$
> >
> > In addition, my commit seen at the review URL above does not show
> > the dependancy. Any ideas now?
> >
> > Thanks!
> > Kyle
> >
> > > If that doesn't work, could you push your working branch to
> > > somewhere I could pull from so I can test it myself? Feel free to
> > > follow up with me in private or open a bug against git-review on
> > > Launchpad if you don't want to run through troubleshooting
> > > back-and-forth on the list.o
> >
> >
> >
> >
> > _______________________________________________
> > OpenStack-dev mailing list
> > OpenStack-dev at lists.openstack.org
> > http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
> >
> > _______________________________________________
> > OpenStack-dev mailing list
> > OpenStack-dev at lists.openstack.org
> > http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-dev
>
>
>
> _______________________________________________
> 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/a074bf63/attachment.html>