Package: git-buildpackage Version: 0.9.10 Severity: wishlist Consider the case that I just had. A package that I maintain had 2 pending changes in its git repository (i.e. after the last upload and thus after the last debian/<version> tag). Someone made a NMU of the package and I wanted to import his work with "gbp import-dsc <dsc-url>".
That worked except that the import effectively reverted the last two pending changes. gbp import-dsc could be smarter. It can detect that the last commit is not the commit of the last upload. It can also import the new source package on top of the last tag and then merge the result in the branch. Worst case the changes are already in the upload and the merge is useless but should not generate conflicts. This logic would probably also help for #670612. At the very least gbp import-dsc should have an "--onto <commit>" option to tell him on top of which commit the import should be done. -- System Information: Debian Release: buster/sid APT prefers oldoldstable APT policy: (500, 'oldoldstable'), (500, 'unstable'), (500, 'testing'), (500, 'stable'), (500, 'oldstable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.16.0-2-amd64 (SMP w/4 CPU cores) Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE=fr_FR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled Versions of packages git-buildpackage depends on: ii devscripts 2.18.3 ii git 1:2.18.0-1 ii man-db 2.8.4-2 ii python3 3.6.6-1 ii python3-dateutil 2.6.1-1 ii python3-pkg-resources 39.2.0-1 ii sensible-utils 0.0.12 Versions of packages git-buildpackage recommends: ii pristine-tar 1.44 ii python3-requests 2.18.4-2 ii sbuild 0.77.0-4 Versions of packages git-buildpackage suggests: ii python3-notify2 0.3-3 ii sudo 1.8.23-2 ii unzip 6.0-21 -- no debconf information
