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
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
