Your message dated Fri, 29 Nov 2013 21:20:37 +0000 with message-id <[email protected]> and subject line Bug#698222: fixed in git-buildpackage 0.6.7 has caused the Debian Bug report #698222, regarding git-import-dsc: does not merge already-imported upstream version 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.) -- 698222: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698222 Debian Bug Tracking System Contact [email protected] with problems
--- Begin Message ---Package: git-buildpackage Version: 0.6.0~git20121124 Severity: wishlist I found the following steps do not work: git-import-orig --no-merge ../foo_1.2.orig.tar.gz git-import-dsc ../foo_1.2-1.dsc The resulting debian/1.2-1 commit is a child of only master, it does not properly merge upstream/1.2 at all. The reason I needed this is because git-import-orig is the only interface with --upstream-vcs-tag. I am importing packages from snapshot.d.o and I want the upstream branch to derive from upstream's git repo. Therefore I needed to import-orig first, then import dsc(s) for that version. The logic in import_dsc seems to assume that if the upstream tag already exists, then it must have already been merged into the debian branch. More robust logic might be to check the ancestry of the debian branch to see if it contains the upstream tag or not. I was able to get by with the following hack that only solves this case but breaks the normal case: diff --git a/gbp/scripts/import_dsc.py b/gbp/scripts/import_dsc.py index 28ceb2e..6b60f00 100644 --- a/gbp/scripts/import_dsc.py +++ b/gbp/scripts/import_dsc.py @@ -344,6 +344,8 @@ def main(argv): parents = [ options.upstream_branch ] if is_empty and not repo.has_branch(options.debian_branch): repo.create_branch(options.debian_branch, commit) + else: + parents = [ options.upstream_branch ] if not src.native: if src.diff or src.deb_tgz: apply_debian_patch(repo, upstream.unpacked, src, options, parents) -- System Information: Debian Release: 7.0 APT prefers testing APT policy: (500, 'testing'), (1, 'experimental'), (1, 'unstable') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.2.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 Versions of packages git-buildpackage depends on: ii devscripts 2.12.6 ii git 1:1.7.10.4-1+wheezy1 ii python 2.7.3~rc2-1 ii python-dateutil 1.5+dfsg-0.1 Versions of packages git-buildpackage recommends: ii cowbuilder 0.70 ii pristine-tar 1.25 Versions of packages git-buildpackage suggests: ii python-notify 0.1.1-3 ii unzip 6.0-8 -- no debconf information
--- End Message ---
--- Begin Message ---Source: git-buildpackage Source-Version: 0.6.7 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: SHA1 Format: 1.8 Date: Fri, 29 Nov 2013 20:52:03 +0100 Source: git-buildpackage Binary: git-buildpackage Architecture: source all Version: 0.6.7 Distribution: unstable Urgency: low Maintainer: Guido Günther <[email protected]> Changed-By: Guido Günther <[email protected]> Description: git-buildpackage - Suite to help with Debian packages in Git repositories Closes: 698222 728896 730788 Changes: git-buildpackage (0.6.7) unstable; urgency=low . * [ab5a708] import-dsc; Merge upstream version by tag instead of simply using the upstream branch name. THis makes sure we also merge upstream versions that were imported previously with e.g. "gbp import-orig". (Closes: #698222) * [2042144] log: add error and warning aliases since I tend to use them instead of err and warn. (Closes: #728896) * [bc5ce39] Fix description of backports branches * [00d830c] Use --distribution instead of --dist (Closes: #730788) Checksums-Sha1: e03c1e826e62931883ec59f0e92f8bf4ef5fafd5 1270 git-buildpackage_0.6.7.dsc 4de2550355b501420b6f8f6c2a0dfd0bcc20680d 218432 git-buildpackage_0.6.7.tar.gz 95acf57ebd04e6fe2099ef91dda4a35a4d139c79 274828 git-buildpackage_0.6.7_all.deb Checksums-Sha256: 3ba380d1204d18ea919f2dc69ec39847544a097a7fac43560c131c0f5c1f8e7e 1270 git-buildpackage_0.6.7.dsc 1085fb88bac999c1bd594aac064ca08705438aa5e94b6d28ffb854a8591ecd4d 218432 git-buildpackage_0.6.7.tar.gz 133c71cb7b5de2d1c23579e1c0e18e7222d5788e6c6c54cec3d81f459b9106bb 274828 git-buildpackage_0.6.7_all.deb Files: b2852add005a4951520999e558b1964b 1270 vcs optional git-buildpackage_0.6.7.dsc 10adcbbf7a633ff3fd2a64e73e0ed770 218432 vcs optional git-buildpackage_0.6.7.tar.gz 28d795d9cb9ae50687ff9b0bbc3a5d7a 274828 vcs optional git-buildpackage_0.6.7_all.deb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iD8DBQFSmPGwn88szT8+ZCYRAsPhAJ9mSxXJ/pdj6+gPR4BS9p7n805kLwCeIbaD MoUmVzQej58zmRaKk3wK3jA= =Ry4B -----END PGP SIGNATURE-----
--- End Message ---
