On Tue, Jan 15, 2013 at 08:43:59AM -0500, Mike Miller wrote: > 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)
It seems that we might want to move the upstream-vcs-tag logic to git-import-dsc then. * Don't you still want to import the upstream tarball too? Escpecially when using git-import-dsc I think we should do: * import upstream tarball with the possibility to have the upstream VCS tag as parent (as with git-import-orig) * proceed from there as usual There wouldn't be any need for using git-import-orig then. Patches are welcome. -- Guido -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
