Your message dated Fri, 14 Aug 2015 19:48:57 +0000 with message-id <e1zqkyh-0004xv...@franck.debian.org> and subject line Bug#778594: fixed in git-buildpackage 0.6.33 has caused the Debian Bug report #778594, regarding gbp import-orig: allow to ignore changes outside of debian/ 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 ow...@bugs.debian.org immediately.) -- 778594: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=778594 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
--- Begin Message ---Package: git-buildpackage Version: 0.6.22 Hello, We use git-buildpackage to maintain the systemd Debian package. I was just trying to import a new upstream version into the experimental branch, which fails: $ git-import-orig --uscan gbp:info: Launching uscan... gbp:info: using ../systemd_219.orig.tar.xz What is the upstream version? [219] gbp:info: Importing '../systemd_219.orig.tar.xz' to branch 'upstream'... gbp:info: Source package is systemd gbp:info: Upstream version is 219 pristine-tar: committed systemd_219.orig.tar.xz.delta to branch pristine-tar gbp:info: Merging to 'experimental' gbp:error: Merge failed, please resolve. (debian/gbp.conf has "debian-branch = experimental", so that's corrrect). Now "git status" shows a huge unresolved mess. http://paste.debian.net/150285/ has the full output, but it looks like this: | Changes to be committed: | | modified: README | modified: catalog/systemd.catalog | modified: catalog/systemd.fr.catalog | new file: catalog/systemd.pt_BR.catalog | [...] These are alright. | Unmerged paths: | (use "git add/rm <file>..." as appropriate to mark resolution) | | both modified: Makefile-man.am | both modified: Makefile.am | both modified: Makefile.in | both modified: NEWS | both modified: TODO | both added: catalog/systemd.pl.catalog | both modified: config.h.in (lots more) | Untracked files: | (use "git add <file>..." to include in what will be committed) | | src/analyze/analyze-verify.h~HEAD | src/analyze/analyze-verify.h~upstream_219 | src/resolve/dns-type.c~HEAD (lots more) Before the import-orig, experimental and upstream branches were identical (except for debian/ of course). I'll resolve these manually (i. e. rm everything, unpack the tarball, then git add everything), so the branch on alioth will probably be ahead when you look at this, so I tar'ed up the local checkout and put it on https://people.debian.org/~mpitt/tmp/systemd-gbp.tar.xz The original tarball is http://www.freedesktop.org/software/systemd/systemd-219.tar.xz (same error with git-import-orig systemd-219.tar.xz) Thanks, Martin -- Martin Pitt | http://www.piware.de Ubuntu Developer (www.ubuntu.com) | Debian Developer (www.debian.org)
--- End Message ---
--- Begin Message ---Source: git-buildpackage Source-Version: 0.6.33 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 778...@bugs.debian.org, and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Guido Günther <a...@sigxcpu.org> (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 ftpmas...@ftp-master.debian.org) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Format: 1.8 Date: Fri, 14 Aug 2015 18:29:53 +0200 Source: git-buildpackage Binary: git-buildpackage git-buildpackage-rpm Architecture: source all Version: 0.6.33 Distribution: experimental Urgency: medium Maintainer: Guido Günther <a...@sigxcpu.org> Changed-By: Guido Günther <a...@sigxcpu.org> Description: git-buildpackage - Suite to help with Debian packages in Git repositories git-buildpackage-rpm - Suite to help with RPM packages in Git repositories Closes: 778594 790889 790890 791473 792692 Changes: git-buildpackage (0.6.33) experimental; urgency=medium . [ Carlos Maddela ] * [da4d469] Add support for referencing existing local repositories when cloning repositories. (Closes: #790889) * [97c7a32] Allow exported patches to be renumbered and the patch number prefix format to be specified as an option. (Closes: #790890) * [279e946] import-orig: Honour --debian-branch option when importing into an empty repo. (Closes: #791473) . [ Guido Günther ] * [035b179] import-orig: Add new --merge-mode=replace. This allows one to not merge upstream versions into the debian branch but rather replace the content of the debian branch and only preserve the debian/ dirs content. (Closes: #778594) * [3d86432] buildpackage: in overlay mode remove debian/ from unpacked tarball. We don't have a way to influence the upstream tarball in overlay mode so remove debian/ after unpack if the source format expects this. (Closes: #792692) Checksums-Sha1: f099be9957ec13f616afbd17f02c0b08fb189ab3 2018 git-buildpackage_0.6.33.dsc cd7e98b8314422b3c1ab6d462353aee4c024bda0 1630500 git-buildpackage_0.6.33.tar.xz eade58f65e30935148d3430e386bb506706ed0fb 69908 git-buildpackage-rpm_0.6.33_all.deb e2f8d916112b30df6a1243847a566812cecfa1d2 316968 git-buildpackage_0.6.33_all.deb Checksums-Sha256: 805a74b601dee6abfa75065f919653ed998df32ed49d48fe1a68baf0d8f9496b 2018 git-buildpackage_0.6.33.dsc 4d3ce4e8233de6bf20c1710b07bc76c3369297221db83df958ebfee05d9d23cb 1630500 git-buildpackage_0.6.33.tar.xz bcfaa23b4a5b8f2e782ffa418b6429dbb8d876de7d8d9a6b3d143425f6bb448b 69908 git-buildpackage-rpm_0.6.33_all.deb 6b5ed1090aad6828aed437f499deb9e812681c68908db994c518daff9ffc7304 316968 git-buildpackage_0.6.33_all.deb Files: 13a00ecdcaab21db97125b66172e6eb2 2018 vcs optional git-buildpackage_0.6.33.dsc 610bb222cbba80bde2babf26a9e6ca15 1630500 vcs optional git-buildpackage_0.6.33.tar.xz cc368cb11ac7caa8a8b49f9bba9428b9 69908 vcs optional git-buildpackage-rpm_0.6.33_all.deb 1a872c88e3bec03392fac22b9b8a8362 316968 vcs optional git-buildpackage_0.6.33_all.deb -----BEGIN PGP SIGNATURE----- iQIVAwUBVc4/aAe4t7DqmBILAQgncRAAlfH4GYo0fgdq4ECvAtK8ZVo9rC0nbd5p 1xaKpdIvCE8MvZHznCrjkhnb58VCKcdPgHHbMQyc6CqT2DQ6iRKqBcGyiC/171eF eOGwRPlQ3jBSnxnHoWLGWlQth5C/v3gG5Bz/B88neeIgsCvNmFvTMZn0wVR6A1+0 AZ8bn/DQIy5MzD/+vetl8JrS+vG6tCSpyHIfEwW+6InMLgTkHfd2u2HPZ3ho5Pwt 1Bo12o1ewQi7RaZ++mh7VB2V6ayK4iIFKxjF7X9LNFe6mwqP1EAIy3fq2OGVZAq2 Ap79HmekVUeu3P/0RCN1JRmEWhgVD+9aZ28uUQ13y2G1CN3oA5S0W9GIGUVtOFQV BEB+Zk97MWe2cnLBGCJEr/+PYq7KvxtWIewh6iRVqOLHaL52e1N/k4w7o7ZHONzy HaQ0BG2Y4Dv1s0REM4ZQKQuSxW1apeYDPbniq5DkFkMDp4g8JPB23NRLI6i6If0N eWdILHFqv2GLdxpIRkWXe3dT5A0lEmZqmwMwpNOHbvpg3jNUe/4XlXDsxsoo+Eaw 5bh0hlrizOVqVAFajMFeai9APIj4cZe1mwq/7tkg6IgOlX9QfcBRurGimUYaEMla CLv+dw8gp1E+ffcNEEM6gpC3Lt+yrP7ozpbk8STnaEj4xIM654S5y8NQORIDnIqM pRu4gvBUiNA= =4kel -----END PGP SIGNATURE-----
--- End Message ---
