Open Stack

Hi Brandon,

Thanks for the quick reply.
I don't use a UI. 

This is what I did to rebase to the latest dependent patches, without doing any changes to my patchset files.

git checkout netscaler-lbaas-driver-v2 # netscaler-lbaas-driver-v2  == the topic branch where I had my original changes. 
git review -d 105610  # this pulls the latest changes you have made for v2 into the branch "review/brandon_logan/bp/lbaas-api-and-objmodel-improvement"
git checkout netscaler-lbaas-driver-v2
git rebase -i "review/brandon_logan/bp/lbaas-api-and-objmodel-improvement"
# At this point the rebase didn't succeed, I resolved the conflict 
git add <files_that_are_resolved>
git commit -a --amend
git review 
<errors>

Thanks,
Vijay V.


-----Original Message-----
From: Brandon Logan [mailto:brandon.logan at RACKSPACE.COM] 
Sent: 18 August 2014 08:53
To: OpenStack Development Mailing List (not for usage questions)
Subject: Re: [openstack-dev] [Neutron][LBaaS] Failure when trying to rebase to latest v2 patches

Hi Vijay,
Are you trying to rebase by pulling down the new changes and rebasing your branch on top of that?  That'll usually end up wrong because of commit hashes.  Have you tried using the rebase button gerrit provides?  Let me know how exactly you're trying to rebase if you've already tried the gerrit rebase button or if you'd like to know how to do it by rebasing locally. 
I'm going to add more details to that GerritWorkflow wiki page.  It's lacking on dependency chains and how to do rebases, cherry-picks, etc without accidentally pushing more patch sets to dependent reviews.  I've been meaning to do I've just been lazy about doing that.

Thanks,
Brandon
________________________________________
From: Vijay Venkatachalam [Vijay.Venkatachalam at citrix.com]
Sent: Sunday, August 17, 2014 9:19 PM
To: OpenStack Development Mailing List (not for usage questions)
Subject: [openstack-dev] [Neutron][LBaaS] Failure when trying to rebase to latest v2 patches

Hi Brandon,

I am trying to rebase Netscaler driver to the latest v2 patches as mentioned in https://wiki.openstack.org/wiki/GerritWorkflow
But it failed during review submit

It failed with the following error
========
remote: Processing changes: refs: 1, done To ssh://vijayvenkatachalam@review.openstack.org:29418/openstack/neutron.git
 ! [remote rejected] HEAD -> refs/publish/master/bp/netscaler-lbass-v2-driver (squash commits first)
error: failed to push some refs to 'ssh://vijayvenkatachalam@review.openstack.org:29418/openstack/neutron.git'
========

Any clues on how to proceed?

Thanks,
Vijay V.
_______________________________________________
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