On Sun, May 28, 2017 at 01:34:04PM -0700, Russ Allbery wrote: > If a package that hasn't been using dgit is uploaded using dgit to > experimental, when it hasn't been uploaded to experimental before, > one cannot use the --overwrite option and merge previous dgit history. > Presumably (I haven't gotten that far yet) this will happen on the > first upload to unstable.
This is already possible: have your git history be a descendent of unstable, and use --deliberately-not-fast-forward instead of --overwrite. Documentation of this is waiting in #856402. (In your case, I would suggest using this trick on the first upload to unstable, so that can be a descendent of the history in experimental.) > I may be naive about dgit's branch model, but it seems like it would > be good to merge dgit's history with the maintainer's history as early > as possible in this process, and experimental uploads (when there's no > previous experimental upload) should be considered a descendent of the > unstable history. > > The separation makes a lot of sense to me for stable branches or > backports branches, but experimental is not a "true" suite in the way > in which it's used in Debian; it's more of a temporary branch from > unstable, and I guess I was expecting dgit to treat it that way. In light of what I wrote above, the suggestion would be to have --deliberately-not-fast-forward be implicit for --new uploads to experimental where HEAD is a descendent of dgit/dgit/sid? -- Sean Whitton
signature.asc
Description: PGP signature
