Your message dated Sun, 23 Feb 2014 18:18:27 +0000
with message-id <[email protected]>
and subject line Bug#739888: fixed in git-buildpackage 0.6.10
has caused the Debian Bug report #739888,
regarding git-import-dsc: --create-missing-branches problem with debian branch
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.)


-- 
739888: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=739888
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: git-buildpackage
Version: 0.6.9
Severity: normal

Hi, thanks for nice tool.

"--create-missing-branches option" has two problem.

1. It is not documented in the manpage.
2. It seems to work only with upstream branch even if some custom branch
   name is requested with "--upstream-branch=fancy" but not with debian 
   branch if some custom branch name is requested with 
   "--debian-branch=debian"

It looks like bug fix for #660898 is working only on missing upstream branch
case.  Please add the similar code for missing debian branch. 

Here is my test case with a simple git repo with master branch holding the
upstream source without autotool generated junks.  I try to import tarball and
package containing autotools generated files in different branch without
creating branch in advance:

 $ git-import-dsc --pristine-tar --debian-branch=debian ../hello-c_1.5-1.dsc
gbp:info: Tag upstream/1.5 not found, importing Upstream tarball
gbp:error: 
Repository does not have branch 'upstream' for upstream sources. If there is 
none see
file:///usr/share/doc/git-buildpackage/manual-html/gbp.import.html#GBP.IMPORT.CONVERT
on howto create it otherwise use --upstream-branch to specify it.

Also check the --create-missing-branches option.

OK... now I know this hidden feature.  
Thanks for fixing https://bugs.debian.org/660898

But this did not work for my case when debian branch was not there.

 $ git-import-dsc --pristine-tar --debian-branch=debian 
--create-missing-branches ../hello-c_1.5-1.dsc
gbp:info: Tag upstream/1.5 not found, importing Upstream tarball
gbp:info: Creating missing branch 'upstream'
pristine-tar: committed hello-c_1.5.orig.tar.gz.delta to branch pristine-tar
gbp:error: Failed to import Debian package: revision 'debian' not found

Let me check a bit more by creating debian branch on maser HEAD and try:
 $ git-import-dsc --pristine-tar --debian-branch=debian 
--upstream-branch=tarball-src --create-missing-branches ../hello-c_1.5-1.dsc
gbp:info: Tag upstream/1.5 not found, importing Upstream tarball
gbp:info: Creating missing branch 'tarball-src'
pristine-tar: committed hello-c_1.5.orig.tar.gz.delta to branch pristine-tar
gbp:info: Version '1.5-1' imported under 'hello-c'
 $ git branch
  debian
* master
  pristine-tar
  tarball-src

So as long as there is debian branch, it works.


-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.12-1-amd64 (SMP w/8 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.14.1
ii  git                   1:1.9.0~rc3-1
ii  man-db                2.6.6-1
ii  python                2.7.5-5
ii  python-dateutil       1.5+dfsg-1
ii  python-pkg-resources  2.1-1

Versions of packages git-buildpackage recommends:
ii  cowbuilder    0.73
ii  pristine-tar  1.30

Versions of packages git-buildpackage suggests:
ii  python-notify  0.1.1-3
ii  unzip          6.0-10

-- no debconf information

--- End Message ---
--- Begin Message ---
Source: git-buildpackage
Source-Version: 0.6.10

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: Sun, 23 Feb 2014 17:56:47 +0100
Source: git-buildpackage
Binary: git-buildpackage
Architecture: source all
Version: 0.6.10
Distribution: unstable
Urgency: medium
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: 733759 739888
Changes: 
 git-buildpackage (0.6.10) unstable; urgency=medium
 .
   * [f1bc542,1b0b17c] config: Don't pull in config defaults twice.
     This would otherwise overwrite values set in the legacy config sections.
     (Closes: #733759)
   * [7e26f91] Remove cover-min-percentage.  It makes running single tests
     harder than necessary since it requires the percentage also when using
     "nose <testname>".
   * [d533e0f] import_dsc: Create missing debian branch with
     --create-missing-branches (Closes: #739888)
   * [df32264] git-import-dsc: Document --create-missing-branches
Checksums-Sha1: 
 0f5bcf8e5c985ea17bc8c6d0f266d3c7972554f0 1273 git-buildpackage_0.6.10.dsc
 16361dc05d8f039054705befac4e4d85f6e6d8e5 1569172 git-buildpackage_0.6.10.tar.xz
 680b2988047c3e4e59105b45aa843bb6ef595f99 274852 git-buildpackage_0.6.10_all.deb
Checksums-Sha256: 
 76fbc564de75b1543ed1476bd3b74f353c310e3f38068a9e3374e3c981dfb7cd 1273 
git-buildpackage_0.6.10.dsc
 f7a250f1e66c3769f56c8c261816c6a119fa4123f9efc95e1fbc8cfe18614eed 1569172 
git-buildpackage_0.6.10.tar.xz
 e3d37608bc4be564bbfa522731b7a084ec1a084eb1d11e70b7f71d52f300bec5 274852 
git-buildpackage_0.6.10_all.deb
Files: 
 8774bdfae043198d6e561546cc4f3c9d 1273 vcs optional git-buildpackage_0.6.10.dsc
 f087125d52178b1ce04cc11c5f2fa33f 1569172 vcs optional 
git-buildpackage_0.6.10.tar.xz
 3d50e05ca5a65105f36c29989ed91825 274852 vcs optional 
git-buildpackage_0.6.10_all.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iD8DBQFTCjddn88szT8+ZCYRAplBAJ9iH1il3qyzIq/xzR12v9REHDunfgCeOrVm
WqhZvDd/mr+cgpNSFlUaDG4=
=wi5q
-----END PGP SIGNATURE-----

--- End Message ---

Reply via email to