severity 741148 wishlist thanks On Sun, Mar 09, 2014 at 08:27:06AM +0100, Johannes Schauer wrote: > Package: git-buildpackage > Version: 0.6.10 > Severity: normal > > Hi, > > upstream offers a newer version than I want to import, so I specify the > older version. But git-import-orig nevertheless imports the most recent > version.
That would be a new feature, so changing severity accordingly. Cheers, -- Guido > > Steps to reproduce: > > $ git clone git://anonscm.debian.org/pkg-e/libs/elementary.git > $ cd elementary > # in case that git moves on before you can look into this, checkout the right > commit > $ git reset --hard debian/1.7.7-3 > # update changed upstream > $ cat > debian/watch << EOF > version=3 > http://download.enlightenment.org/rel/libs/elementary/elementary-([\d\.]+)\.tar\.gz > EOF > $ git commit -a -m "update debian/watch" > $ git fetch origin upstream:upstream pristine-tar:pristine-tar > $ git-import-orig --uscan --upstream-version=1.8.5 --verbose > gbp:info: Launching uscan... > gbp:info: using ../elementary-1.9.0.tar.gz > gbp:debug: ['git', 'rev-parse', '--show-cdup'] > gbp:debug: ['git', 'rev-parse', '--is-bare-repository'] > gbp:debug: ['git', 'symbolic-ref', 'HEAD'] > gbp:debug: ['git', 'show-ref', 'refs/heads/master'] > gbp:debug: ['git', 'show-ref', 'refs/heads/upstream'] > gbp:debug: ['git', 'status', '--porcelain'] > gbp:debug: tar ['-C', '../tmpB8ZPfG', '-a', '-xf', > '../elementary-1.9.0.tar.gz'] [] > gbp:debug: Unpacked '../elementary-1.9.0.tar.gz' to > '../tmpB8ZPfG/elementary-1.9.0' > gbp:info: Importing '../elementary-1.9.0.tar.gz' to branch 'upstream'... > gbp:info: Source package is elementary > gbp:info: Upstream version is 1.8.5 > gbp:debug: ['git', 'add', '-f', '.'] > gbp:debug: ['git', 'write-tree'] > gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', 'upstream'] > gbp:debug: ['git', 'commit-tree', 'e2fb4b3992dda5a4b7bd21d90e5de3809e64dcfa', > '-p', '91f53c6167d75346c92c2e72af94be70c914d4ec'] > gbp:debug: ['git', 'update-ref', 'refs/heads/upstream', > 'ccfa19ac7edf5d7c5f7786e5dcd431b8933b2e1c', > '91f53c6167d75346c92c2e72af94be70c914d4ec'] > gbp:debug: ['git', 'tag', '-m', 'Upstream version 1.8.5', 'upstream/1.8.5', > 'ccfa19ac7edf5d7c5f7786e5dcd431b8933b2e1c'] > gbp:info: Merging to 'master' > gbp:debug: ['git', 'symbolic-ref', 'HEAD'] > gbp:debug: ['git', 'show-ref', 'refs/heads/master'] > gbp:debug: ['git', 'help', 'merge', '-m'] > gbp:debug: ['git', 'merge', '--no-summary', '--no-edit', 'upstream/1.8.5'] > gbp:debug: ['git', 'symbolic-ref', 'HEAD'] > gbp:debug: ['git', 'show-ref', 'refs/heads/master'] > gbp:debug: rm ['-rf', '../tmpB8ZPfG'] [] > gbp:info: Successfully imported version 1.8.5 of ../elementary-1.9.0.tar.gz > $ head -3 NEWS > ================ > Elementary 1.9.0 > ================ > > So even though I specified to use version 1.8.5, version 1.9.0 was > imported but named 1.8.5. If this is not a bug but a feature, then I > request that this be mentioned in the man page. It might nevertheless be > nice to have an option which allows me to import a specific upstream > version with --uscan. > > cheers, josch > > > > > -- System Information: > Debian Release: jessie/sid > APT prefers testing > APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental') > Architecture: amd64 (x86_64) > Foreign Architectures: i386 > > Kernel: Linux 3.11-2-amd64 (SMP w/4 CPU cores) > Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) > Shell: /bin/sh linked to /bin/dash > > Versions of packages git-buildpackage depends on: > ii devscripts 2.13.5 > ii git 1:1.8.5.3-1 > ii man-db 2.6.5-2 > ii python 2.7.5-5 > ii python-dateutil 1.5+dfsg-1 > ii python-pkg-resources 2.2-1 > > Versions of packages git-buildpackage recommends: > pn cowbuilder <none> > ii pristine-tar 1.30 > > Versions of packages git-buildpackage suggests: > pn python-notify <none> > ii unzip 6.0-10 > -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
