Package: git-buildpackage
Version: 0.9.22
Severity: important
Tags: sid trixie bookworm bullseye
X-Debbugs-Cc: eribe...@debian.org
Dear Maintainer,
When using:
gbp import-dscs --debsnap acr
or
debsnap acr; gbp import-dscs source-acr/*.dsc
the result is the upstream branches out-of-order. See the following command
after an import (important lines only):
$ git log
commit 17d263cee50d3f4b8ba881ca7216194672e7fdfb (HEAD -> debian/master, tag:
debian/1.9.4-2)
Author: Thiago Marques Siqueira <thiagoms...@gmail.com>
Date: Sun Jul 9 17:11:06 2023 +0100
[...]
commit 8b622b80fb70e9cbdbd071f1d7f714f3f9629e57 (tag: debian/1.9.4-1)
Merge: 4adf342 ce6c977
Author: Ruben Pollan <mes...@sindominio.net>
Date: Wed Nov 11 13:04:48 2020 +0100
[...]
commit 4adf342f0ecaf0853e88882a67ce4ecd3e1acc4b (tag: debian/1.9.2-1)
Merge: 5c67e33 e093e17
Author: Ruben Pollan <mes...@sindominio.net>
Date: Mon May 11 17:50:30 2020 +0200
[...]
commit ce6c977714bed2df56c2b5196c63be93163b9c76 (tag: upstream/1.9.4, upstream)
Author: Joao Eriberto Mota Filho <eribe...@debian.org>
Date: Sun Aug 6 12:49:57 2023 -0300
[...]
commit 5c67e33227e93c952beb794f187f0ea939bf6da3 (tag: debian/1.7.2-1)
Merge: bf4799a 8fb8e10
Author: Ruben Pollan <mes...@sindominio.net>
Date: Thu Feb 21 13:36:37 2019 +0100
[...]
commit e093e17ad41e54455a91294fe7f91ea02a9d3b32 (tag: upstream/1.9.2)
Author: Joao Eriberto Mota Filho <eribe...@debian.org>
Date: Sun Aug 6 12:49:57 2023 -0300
[...]
commit bf4799a838a39ebfc55ab0a5927d8199918ed5ee (tag: debian/1.7.0-1)
Merge: f75f0d0 4ed59ec
Author: Ruben Pollan <mes...@sindominio.net>
Date: Tue Oct 2 12:40:27 2018 -0500
[...]
commit 8fb8e104db07fac42c81a796c50cf47febdb130b (tag: upstream/1.7.2)
Author: Joao Eriberto Mota Filho <eribe...@debian.org>
Date: Sun Aug 6 12:49:56 2023 -0300
[...]
commit f75f0d08a3b8e81914fbe69450e1215be93231e1 (tag: debian/1.6.2-1)
Merge: 8765fb7 b83b9fb
Author: Ruben Pollan <mes...@sindominio.net>
Date: Fri May 18 20:20:29 2018 +0200
[...]
commit 4ed59ece03f46f22e525615aa3283ce8e4344043 (tag: upstream/1.7.0)
Author: Joao Eriberto Mota Filho <eribe...@debian.org>
Date: Sun Aug 6 12:49:56 2023 -0300
[...]
commit 8765fb751b746fb7e2aa320821972735869ca8d7 (tag: debian/1.6.1-1)
Merge: 281c76f 3916c6a
Author: Ruben Pollan <mes...@sindominio.net>
Date: Mon Apr 16 09:54:12 2018 +0200
[...]
I consider this issue 'important' because several people use gbp import-dscs to
create a repository for a package, keeping all previous history. Importing each
package by hand using import-dsc (not dscs) will work fine.
Regards,
Eriberto
-- System Information:
Debian Release: trixie/sid
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)
Kernel: Linux 6.1.0-10-amd64 (SMP w/16 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE,
TAINT_UNSIGNED_MODULE
Locale: LANG=C.UTF-8, LC_CTYPE=C.UTF-8 (charmap=UTF-8) (ignored: LC_ALL set to
C.UTF-8), LANGUAGE=C.UTF-8
Shell: /bin/sh linked to /usr/bin/dash
Init: unable to detect
Versions of packages git-buildpackage depends on:
ii devscripts 2.23.5
ii git 1:2.40.1-1
ii man-db 2.11.2-3
ii python3 3.11.4-5+b1
ii python3-dateutil 2.8.2-2
ii python3-pkg-resources 68.0.0-1
ii python3-yaml 6.0.1-1
ii sensible-utils 0.0.20
Versions of packages git-buildpackage recommends:
ii cowbuilder 0.89
ii pbuilder 0.231
ii pristine-tar 1.50
ii python3-requests 2.31.0+dfsg-1
Versions of packages git-buildpackage suggests:
pn python3-notify2 <none>
ii sudo 1.9.14p2-1
ii unzip 6.0-28
-- Configuration Files:
/etc/git-buildpackage/gbp.conf changed:
[DEFAULT]
debian-branch = debian/master
pristine-tar = True
[buildpackage]
[import-orig]
[import-dsc]
[dch]
[pq]
[clone]
[pull]
[create-remote-repo]
[remote-config pkg-libvirt]
remote-url-pattern = ssh://git.debian.org/git/pkg-libvirt/%(pkg)s
template-dir =
/srv/alioth.debian.org/chroot/home/groups/pkg-libvirt/git-template
