On Thu, Apr 20, 2017 at 02:44:31PM +0000, Lukasz Walewski wrote: > >-----Ursprüngliche Nachricht----- > >Von: Guido Günther [mailto:[email protected]] > >Gesendet: Donnerstag, 20. April 2017 15:57 > >An: Lukasz Walewski > >Cc: [email protected] > >Betreff: Re: [git-buildpackage] gbp does not recognize the newly merged > >& tagged upstream version > > > >This is very likely because you didn't tell gbp how your upstream > >tags look like. > >> > >> Well, I think I did, but it can still be wrong... Here is my config > >file: > >> > >> $ cat debian/gbp.conf > >> [DEFAULT] > >> debian-branch=debian > >> upstream-branch=master > >> > >> [buildpackage] > > ^^^^^^^^^^^^^^ > >> upstream-tag=v%(version)s > >means it only affects buildpackage but not dch (or nothing else) > > Oh! You are right, I overlooked that tiny detail! > > >You can check if dch sees the right tag format > > After fixing my gbp.conf according to your suggestions, (I think) I get the > right upstream-tag: > > $ gbp config dch.upstream-tag > dch.upstream-tag=v%(version)s > > However, after running dch and buildpackage I still get the wrong version. > Interestingly, dch doesn't detect any changes in my working tree: > > $ gbp dch --snapshot --auto > gbp:info: Changelog last touched at 'a1b2c3d4' > gbp:info: Continuing from commit 'a1b2c3d4' > gbp:info: No changes detected from a1b2c3d4 to HEAD. > gbp:info: Changelog has been prepared for snapshot #1 at a1b2c3d4 > > although I merged v1.0.3, which _does_ contain changes. Should I commit the > merge first?
Ahh...yes, commit first - it won't work when you did not commit. The tag should also be an annotated tag (not a lightweight one). If this still fails can you send the output a run with --verbose? > Apparently, we've found one bug in my setup (thanks for that!) but > unfortunately it was not the only one... Let's see if we can find the others. -- Guido > > Best, > 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 > [email protected] > > 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 !" > _______________________________________________ git-buildpackage mailing list [email protected] http://lists.sigxcpu.org/mailman/listinfo/git-buildpackage
