Hi Russ, On Tue, Mar 20, 2012 at 11:49:17AM -0700, Russ Allbery wrote: > Andrey Rahmatullin <w...@wrar.name> writes: > > > The current documentation says nothing about integrating with the > > upstream git repo or an imported (via git-svn etc) upstream VCS while > > the tools seem to support this workflow. This leads to inventing > > workflows instead of adopting some recommended one. So it would be > > useful to at least add some tips to the documentation about using > > upstream tags in upstream-tag, using pristine-tar with upstream tags and > > upstream tarballs etc. > > I'd really like to incorporate the workflow documented in README.source in > the openafs source package into git-buildpackage, which involves making > the upstream branch imports a merge commit between the upstream Git > repository and the current local upstream repository with the differences > between the upstream Git tag and the release tarball (generally the > addition of generated files) committed as part of the merge. This works > very well, but is currently awkward because it requires extra supporting > scripts rather than using git-import-orig. > > Unfortunately, Python isn't a strong language for me and I've not had time > to do the implementation, but if anyone feels inspired to add such an > option to git-import-orig, I think it's a very compelling workflow for > upstreams that have a Git repository but also do tarball releases.
Could you describe the branch layout you use and "user interface" you'd expect from git-import-orig for that? I assume you'd have something like: git-import-orig --upstream-vcs-tag=v1.0.0 upstream_1.0.0.orig.tar.gz Which would create something like: + master |\ | \ | + upstream, upstream/1.0.0 contains upstream_1.0.0.tar.gz | |\ | | \ | | + v1.0.0 (on upstream's git branch) | | | | | | ... Where 'master' is the branch with the debian packaging, 'upstream' git-buildpackage's upstream branch. and v1.0.0 a tag on where the "real upstream development happens" (from upstream's git). Is that correct? If so I could try to get around to add that. It seems the only modification needed is to specify an additional parent when importing the upstream tarball or am I missing something? Cheers, -- Guido > > (This workflow was originally developed by Sam Hartman for the krb5 > package.) > > -- > Russ Allbery (r...@debian.org) <http://www.eyrie.org/~eagle/> > > -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
