[PKG-Openstack-devel] Bug#858693: Bug#858693: Bug#858693: Bug#858693: Gerrit branch missing?

[Thomas Goirand]

On 03/25/2017 11:10 PM, David Rabel wrote:
> On 25.03.2017 22:53, David Rabel wrote:
>> On 25.03.2017 22:34, Thomas Goirand wrote:
>>> On 03/25/2017 12:01 PM, David Rabel wrote:
>>>> Hi,
>>>>
>>>> I have the patch ready, but when I "git review" it, it tries to rebase
>>>> the branch to gerrit/master. Is it possible that branch debian/newton is
>>>> missing in gerrit?
>>>
>>> That's unlikely. What maybe is happening, is that the .gitreview file
>>> doesn't point to the correct repository / branch.
> 
> I found it. .gitreview and .git/config both had a wrong repository and
> .gitreview also did not have a defaultbranch.
> 
> Thank you.
> 
> David

Just so that you understand by what mechanism this happens...

Upstream, at some point, forks a new branch that it calls stable. Let's
say stable/newton. In this branch, the .gitreview will have to point to
that new branch. Therefore, the .gitreview file is edited in this new
branch to point at the correct stable/newton branch.

What happens in our packaging branch is that, when we do a git commit of
a new tag, the .gitreview file may be overwritten, because it changed in
upstream (because of the creation of new branch as I wrote above).
Therefore, we constantly have to check for that .gitreview file content
before doing a merge commit.

I'm not sure in this specific case (ie: gnocchi) what happened though.

Cheers,

Thomas Goirand (zigo)