>-----Ursprüngliche Nachricht----- >Von: Guido Günther [mailto:[email protected]] >Gesendet: Donnerstag, 20. April 2017 17:55 >An: Lukasz Walewski >Cc: [email protected] >Betreff: Re: [git-buildpackage] gbp does not recognize the newly merged >& tagged upstream version > >> However, buildpackage does not like the merged changes: >> >> $ gbp buildpackage --git-ignore-new -us -uc >> gbp:info: Exporting 'HEAD' to '/home/.../build/my-project-tmp' >> gbp:info: Moving '/home/.../build/my-project -tmp' to '/home/my- >project-1.0.2' >> dpkg-buildpackage -rfakeroot -D -us -uc -i -I >> dpkg-buildpackage: source package my-project >> dpkg-buildpackage: source version 1.0.2-2 > >…but here it writes 1.0.2-2. Because you're building with >--git-export-dir it seems.
Yes! My gbp.conf states that explicitly: $ cat debian/gbp.conf [DEFAULT] upstream-branch=lwalewski debian-branch=debian upstream-tag=v%(version)s [buildpackage] export-dir=build ^^^^^^^^^^^^^^^^ By doing this, I wanted to clean up my build environment and get rid of packages and intermediate dirs hanging all over the parent dir. Is it not recommended or unusual to use this feature? >In this case you have to pass > > --git-export=WC > >to the buildpackage call Well, but then one needs to be careful with the export-dir - in my case it is located inside of my working copy (and ignored in the .gitignore file) so I got a whole lot of errors related to some leftovers from previous builds: dpkg-source: error: unrepresentable changes to source However, I eventually got it working by removing the export-dir from my working copy and including the --git-export=WC option, which is a workaround, but we can improve it further, I guess. 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
