On Sun, May 28, 2017 at 03:12:11PM -0700, Russ Allbery wrote:
> Oh, okay, I think I understand.  And then, when uploading to unstable, it
> would then work?  Or would I need --overwrite on the upload to unstable?

In the context of uploads that are new to a suite, it is best to think
of --overwrite and --deliberately-not-fast-forward as mutually
exclusive.

For the first upload of policy 4.0.0.x to unstable, I'm suggesting
--deliberately-not-fast-forward so that the history is a linear
descendent of the upload you made to experimental today.  With
--overwrite, instead, the parent of HEAD would be a pseudomerge with
dgit's representation of policy 3.9.8.0.  Maybe you prefer this, of
course.

(This is a pretty confusing aspect of dgit that only became apparent
after some conversations Ian had at FOSSDEM.  Sorry that documentation
has not caught up.)

-- 
Sean Whitton

Attachment: signature.asc
Description: PGP signature

Reply via email to