Your message dated Sat, 07 Sep 2019 21:33:48 +0000
with message-id <[email protected]>
and subject line Bug#782886: fixed in git-buildpackage 0.9.15
has caused the Debian Bug report #782886,
regarding git-import-dsc to support --upstream-vcs-tag
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
782886: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=782886
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: git-buildpackage
Version: 0.6.22
Severity: wishlist
The --upstream-vcs-tag for git-import-orig is nice. Thanks.
Also pending fix to #700411 "git-import-orig should filter the upstream
debian director" is also nice.
What about git-import-dsc to support --upstream-vcs-tag.
I mean that the upstream branch is not just a copy of upstream tar but
also a merge commit from tag specified by the --upstream-vcs-tag on the
upstream-vcs branch. Then the master (debian) branch is commited
exactly as dpkg-source -x --unapply-patches but also a merge commit from
the upstream. The reast are the same as the good old git-import-dsc.
Right now, if I use git-import-orig --upstream-vcs-tag, master branch
has merge conflict if the upstream has debian/ directory with some
changes. It should disregard changes in debian/. Yes, I manually fix
this by copying debian source tree and commiting it. But having
git-import-dsc with --upstream-vcs-tag should make starting the few
recent packages commited to the local git which has upstream vcs clone
in it very easy.
Osamu
-- System Information:
Debian Release: 8.0
APT prefers testing-updates
APT policy: (500, 'testing-updates'), (500, 'testing')
Architecture: amd64 (x86_64)
Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
Versions of packages git-buildpackage depends on:
ii devscripts 2.15.3
ii git 1:2.1.4-2.1
ii man-db 2.7.0.2-5
ii python 2.7.9-1
ii python-dateutil 2.2-2
ii python-pkg-resources 5.5.1-1
Versions of packages git-buildpackage recommends:
ii cowbuilder 0.73
ii pristine-tar 1.33
Versions of packages git-buildpackage suggests:
ii python-notify 0.1.1-4
ii unzip 6.0-16
-- no debconf information
--- End Message ---
--- Begin Message ---
Source: git-buildpackage
Source-Version: 0.9.15
We believe that the bug you reported is fixed in the latest version of
git-buildpackage, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Guido Günther <[email protected]> (supplier of updated git-buildpackage package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Sat, 07 Sep 2019 10:58:51 -0700
Source: git-buildpackage
Architecture: source
Version: 0.9.15
Distribution: unstable
Urgency: medium
Maintainer: Guido Günther <[email protected]>
Changed-By: Guido Günther <[email protected]>
Closes: 782886 939648
Changes:
git-buildpackage (0.9.15) unstable; urgency=medium
.
[ Guido Günther ]
* [b12b85a] import-orig: Allow to run a post unpack hook.
The working directory of the hook is the top temporary directory the
tarballs are being unpacked into.
* [6696656] docs: Document gbp import-orig --postunpack
* [292edcf] import_orig: Move upstream-vcs-tag's help to config.
This way it can be shared.
* [61757c0] import_dsc: Support upstream-vcs-tag (Closes: #782886)
* [1acd0bb] docs: import-dsc: Document --upstream-vcs-tag
* [b888349] gbp-clone: Support salsa: pseudo urls
* Fix flake8 errors (Closes: #939648)
.
[ Hideki Yamane ]
* [d1960b3] gbp.conf: Set default compresson to xz.
The value is commented out so does not have any effect but it's
better to recommend the right value.
.
[ Maximiliano Curia ]
* [8afb7ee] import-orig/merge_replace Avoid calling force_head.
The debian_merge_by_replace function ends up calling force_head, but up to
this point the current branch could be anything, and thus when called from
a feature branch the latest commits get lost.
Checksums-Sha1:
f27941cab1cb18fbd9f0c0740cb5dcee2eb3893a 2274 git-buildpackage_0.9.15.dsc
47f92b695b167699b967e3de46eb9bf5cb697ab0 890616 git-buildpackage_0.9.15.tar.xz
57783f1890cf12b5aafff64a922a4552b820d190 12548
git-buildpackage_0.9.15_amd64.buildinfo
Checksums-Sha256:
f1a2cdd4625fc048bafc3b8a3e9878d1cc5ff6f6bebf93e9b72988e98bf73843 2274
git-buildpackage_0.9.15.dsc
7852d9bcbe744022955232e11e563d4d75bd5b9f68b9af24eeeda09877cfbeee 890616
git-buildpackage_0.9.15.tar.xz
656d64d28f74e845c554515e9f9ceabc14e0c2ec25ebae2b0a4218ae2e488fbb 12548
git-buildpackage_0.9.15_amd64.buildinfo
Files:
ef103b0a448ac9021887a9fe0565d6d2 2274 vcs optional git-buildpackage_0.9.15.dsc
355abd64963d8924046e6004879eafc7 890616 vcs optional
git-buildpackage_0.9.15.tar.xz
e147313ac226281d1c7aa8b97511fd95 12548 vcs optional
git-buildpackage_0.9.15_amd64.buildinfo
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCAAdFiEEvHzQcjh1660F3xzZB7i3sOqYEgsFAl10HqoACgkQB7i3sOqY
EgtENw/9G7drMn1s2j+ZwRWIv2tgEFV845VgTVb0q68rtMaYL9/g3/9sTBmPuKF2
krS8gPu32ud+FqWYGvzvrdmkM2nbLrvoMFYDrMqxCU5WeqWaiUMyewPGXaLfacvw
aFYK/6bewip0o9gogJfmIAyGXr/bMZQV8iCmBSCiMUQoOwj9TYxou/g7BwMFz3zB
6Rzh7E0rNK0d6QkyDZIRRd8tlvBu/HXb7vd+tYLjgBF4FRi1Im74mwNRFQWTkjhG
koIGCD4jszACHPz9UZB1B0hSnKzY5uNogD6xpSJxzmIrtm6zHuroi/GpoOO0D0FQ
QynEIDMbol2Ja9BB+wXYJUpgwS0jMv2xOft53UegoPP6++3HiT7+cjfcbdwjmQ5z
kZzrw9K8mAnG9ESi8IvGrS1U5rFkImnKpiFAwVm/xGbu+hFEBLK6pl0E70yWMU7j
Ii+Kqk8M1+6MCYWsTOV2fl5WIca0VKINmRIs5rnOie8CMGs3P2SD9WnY7+u6qj1S
yuk4oeXIHkKv5zP+FQZ8HmkDAYGdizFz1ZVpoLyTNz9OTCSTUrh7yPTZqj5/wuG4
mXqvrUbWKIdfv96qiqKwBLNOT3tM89EIg+YHViKsy7uPyVwG+Am7AapuPvbZLm5N
D4rSIQBnZSRZKuU4Ad6Hn1cy03Mm3IEAGvbUjcdO/HfEcuUdAyo=
=q6Hd
-----END PGP SIGNATURE-----
--- End Message ---
