[git-buildpackage] gbp does not recognize the newly merged & tagged upstream version

[Guido Günther]

Hi Lukasz,
On Fri, Apr 21, 2017 at 09:28:12AM +0000, Lukasz Walewski wrote:
> Hi Guido,
> 
> Thanks for your help, I think I finally got it to work. In summary:
> 
> 1. I had a bug in my gbp.conf that caused different behavior of 'gbp
> buildpackage' and all other tools, in particular 'gbp dch'.
> 
> 2. When merging the upstream changes I did not commit after resolving conflicts, which was my stupid error.
> 
> 3. I had my export-dir inside the working copy, which confused dpkg-source at some point. That did not affect my original problem of 'buildpackage' not detecting the new upstream tag but was nice to get to know anyway.
> 
> 4. My upstream branch was correctly tagged with an annotated tag and not with a lightweight one.
> 
> All in all I can't really tell what exactly caused my problem, it seems that the accumulation of errors resulted in an undefined state of my dev environment (including my mind), which I could not resolve myself.

I guess it was a combination of all of the above.

> 
> For the time being I can go with what I learned, but I feel that my
> understanding is still not complete, esp. regarding 'gbp dch' and the
> changelog story. I think it would not be bad to have the documentation
> more verbose on when to include the 'debian/' dir while running 'gbp
> dch' and why.

I've expaneded on this in

    https://honk.sigxcpu.org/projects/git-buildpackage/manual-html/man.gbp.dch.html

Cheers,
 -- Guido

> 
> In any case, thanks for your help!
> 
> Best regards,
> Lukasz
> 
> 
> ----------------------------------------
> 
> scan Messtechnik GmbH
> Brigittagasse 22-24
> A-1200 Wien/Vienna
> tel. +43 1 219 73 93 - 0
> fax +43 1 219 73 93 - 12
> http://www.s-can.at
> office at s-can.at
> 
> Geschaeftsfuehrer/President: DI Andreas Weingartner
> Firmenbuchnummer/Incorporation No: FN178880i
> Gerichtsstand/Court of Jurisdiction: Wien/Vienna
> 
> ----------------------------------------
> 
> s::can - intelligent, optical, online
> 
> i::scan - compact, precise and affordable!
> UV254::NTU::FTU::TOC::DOC::COD::BOD::Colour ...and many more to come!
> http://www.i-scan.at
> ----------------------------------------
> "YES WE SCAN !"
>