On 26 July 2011 10:02, Shaun Jackman <[email protected]> wrote: > On 25 July 2011 17:13, Charles Plessy <[email protected]> wrote: >> Le Mon, Jul 25, 2011 at 05:03:55PM -0700, Shaun Jackman a écrit : >>> >>> I used git-import-orig from git-buildpackage 0.5.26, but it didn't >>> update the pristine-tar branch by default. I'll read the man page >>> tomorrow and see if I can get it working. >> >> git-import-orig --pristine-tar :) >> >> Also, it can be made the default using a debian/gbp.conf file (example in >> /etc/gbp.conf). I actually recommend this, since the presence of the file >> reminds that the package uses git-buildpackage. > > Do you know how I can generate the pristine-tar data now, after I've > already committed upstream/2.0.6? Trying git-import-orig > --pristine-tar makes a mess of it: > > $ git-import-orig --pristine-tar ../2.0.6/igv_2.0.6.orig.tar.bz2 > What is the upstream version? [2.0.6] > gbp:info: Importing '../2.0.6/igv_2.0.6.orig.tar.bz2' to branch 'upstream'... > gbp:info: Source package is igv > gbp:info: Upstream version is 2.0.6 > pristine-tar: committed igv_2.0.6.orig.tar.bz2.delta to branch pristine-tar > fatal: tag 'upstream/2.0.6' already exists > gbp:error: git returned 128 > gbp:error: Couldn't tag "upstream/2.0.6" > gbp:error: Import of ../2.0.6/igv_2.0.6.orig.tar.bz2 failed
Figured it out: pristine-tar commit ../igv_2.0.6.orig.tar.bz2 Cheers, Shaun -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/cadx6m3qceml7jti7w8ootujseg6ry5rjcuijnzjczpv6aqb...@mail.gmail.com
