Re: Keeping upstream commits separate from Debian packaging commits
On 12 October 2014 08:49, Thomas Goirand <zigo@debian.org> wrote:
> Also, during the Debconf discussion, we decided we would use the
> pristine-tar workflow, *not* using upstream VCS merge. A
> "git-import-orig" normally goes into a single commit, which I don't
> think would bother anyone (not on the list, or on IRC).
I wasn't at Debconf, maybe this is why I'm a bit confused by what you
wrote here. pristine-tar and upstream VCS merge are in no way mutually
exclusive, but you seem to be implying that they are; did I misread
what you wrote? pristine-tar just needs a commit to base the tar delta
off of; this can be a tag created via git-import-orig, but it can just
as easily be a tag pulled from upstream. (Using upstream tags
*without* using pristine-tar would seem to be inadvisable, with the
possible exception of upstreams who don't release tarballs, and/or
sign all their release tags)
> the DPMT. Anyone who doesn't respect what we are collectively agree on
> should IMO take the blame for what happened on IRC and on the commit
> list, and pointing fingers at whoever configured it is IMO wrong.
I haven't seen anyone write "importing upstream VCS into the Alioth
repo is forbidden" anywhere; if this is the intent, then perhaps it
should be clearly spelled out somewhere. (Or perhaps it already is,
and I just missed it? In which case, whoops)
--
mithrandi, i Ainil en-Balandor, a faer Ambar
Reply to: