On Sun, May 28, 2017 at 02:59:16PM -0700, Russ Allbery wrote: > > 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.
Just to be clear, this is a bit of a fudge, and not the use for which --deliberately-not-fast-forward option was intended. That's why it's somewhat hidden away. > 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? No, it basically prevents that automatic merge from happening (and as such it only works when the package is new in the suite). By "descendent of unstable" I just meant your old, non-dgit history which contains a commit corresponding to what you last uploaded to unstable. > > 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.) I think what I suggested would supply that, but it might not be wise to ignore the user's --overwrite. -- Sean Whitton
signature.asc
Description: PGP signature
