Re: [openstack-dev] [Neutron][LBaaS] Failure when trying to rebase to latest v2 patches

2014-08-18 Thread Brandon Logan
Development Mailing List (not for usage questions) Subject: Re: [openstack-dev] [Neutron][LBaaS] Failure when trying to rebase to latest v2 patches This worked. Thanks! But this procedure requires to clone again. I wonder why rebase didn’t work and cherry pick worked. May be I should tried

Re: [openstack-dev] [Neutron][LBaaS] Failure when trying to rebase to latest v2 patches

2014-08-17 Thread Doug Wiegley
From the looks of your error, you at least have a problem with more than one commit in your topic branch. Here¹s the process that I use. I¹m not claiming it¹s the best, but it works without rewriting Brandon¹s commits. Watch the git log at the end, and make sure the dependent hashes match

Re: [openstack-dev] [Neutron][LBaaS] Failure when trying to rebase to latest v2 patches

2014-08-17 Thread Brandon Logan
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

Re: [openstack-dev] [Neutron][LBaaS] Failure when trying to rebase to latest v2 patches

2014-08-17 Thread Vijay Venkatachalam
) 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

Re: [openstack-dev] [Neutron][LBaaS] Failure when trying to rebase to latest v2 patches

2014-08-17 Thread Vijay Venkatachalam
To: OpenStack Development Mailing List (not for usage questions) Subject: Re: [openstack-dev] [Neutron][LBaaS] Failure when trying to rebase to latest v2 patches From the looks of your error, you at least have a problem with more than one commit in your topic branch. Here¹s the process that I use