On Tue, Jan 15, 2013 at 10:56:27AM -0500, Mike Miller wrote: > On Tue, Jan 15, 2013 at 10:15 AM, Guido Günther wrote: > > On Tue, Jan 15, 2013 at 08:43:59AM -0500, Mike Miller wrote: > >> 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. > >> > >> [...] > > > > It seems that we might want to move the upstream-vcs-tag logic to > > git-import-dsc then. > > Makes sense, that would address what I was really trying to do. If > there's no other use case for doing separate import-orig followed by > import-dsc, feel free to redefine this bug as "support git-import-dsc > --upstream-vcs-tag". > > Even better would be to somehow support upstream-vcs-tags with > "git-import-dscs --debsnap" but I'm not sure how you would map > multiple versions to tags without an unwieldy interface.
We could allow for a pattern like we do with the upstream-tag pattern. That would at least help for simple cases where there's a mapping between the upstream version number and the upstream tag like v%(version)s or similar. > > > * Don't you still want to import the upstream tarball too? > > Yes, I used --pristine-tar on the import-orig. > > > 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. > > Sounds good, thanks for the feedback, I'll look at that. Great! -- Guido -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
