Hello, Simon Josefsson [08/Jan 8:41am +01] wrote: > I think this will be revisited in discussion again and again, because it > is not a simple technical matter with a simple solution, but there is > one approach that I didn't see suggested how to deal with this: > > Instead of rewriting git history: prune it. That is, get upstream to > remove offensive non-DFSG material from their git project in the first > place, and then start an Debian upstream-code branch from that commit. > > Yes, older branches will still contain non-DFSG content, but at least > the "modern" branch that we use for building will not contain non-DFSG > content, even in the git history. > > I think this is an acceptable and practical approach that will meet even > the most stringent reviews from anyone who is concerned about having > non-DFSG content in a git branch. > > This approach can also be adopted to deal with really large upstream git > projects. > > As for what to do with old branches, it doesn't really matter. There > are fewer reasonable arguments for not preserving factual history. > (Although snapshot.debian.org's removal of some old files may be > reasonable, or it may not..)
Well, yes, but upstram will probably just refuse to do that. -- Sean Whitton

