Sean Whitton <spwhit...@spwhitton.name> writes:

> 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.

Ah, yes, I presume that would work.  Does that merge the dgit history of
the package from the unstable branch into the history in the way that
dgit-maint-native implies is supposed to happen?  Or by "be a descendent
of unstable" do you mean a descendent of the dgit unstable repository?

> 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?

I think the missing piece may be how the naive new user like myself, who
is currently told to just do dgit push --overwrite, should create the
appropriate merge so that this condition is true of my existing
repository.  (I know enough Git that I could probably fumble my way
through, but dgit should probably do it for me somehow.)

-- 
Russ Allbery (r...@debian.org)               <http://www.eyrie.org/~eagle/>

Reply via email to