Hi, On Tue, 2021-07-06 at 18:02 -0700, Sean Whitton wrote: > Hello Osamu, > > Thank you for this feedback. > > I think our hope is that DDs do not need to read dgit(7) at all. May I > ask what prompted you to take a look? Have you seen the workflow > tutorial manpages?
In order to try dgit for my imediff package, I was initially reading dgit-maint- merge(7). It's basically a Ncurses based merge/split tool for which I took over upstream. Since I was upstream, I was comiting everything to devel branch. Then I made a upstream tarball by excluding debian/ directory. Using this upstream tarball, I was making non-native dpkg 3.0 (quilt) package. That tarball and uploaded debian package was kept in repo as gbp-style branches (master/upstream/pristine-tar). Since I sometimes made the last minutes change to debian/changelog, master was not exactly as devel. So after upload, I merged master back to devel. I got sick of this complicated scheme and tried git-maint-merge(7). Basically, devel branch was patch applied while master was sometimes created manually using git-format-patch etc. on devel branch. Naturally, "Existing git history using another workflow" was the one and I started from my devel branch. The last part of this document goes as: > The first dgit push will require --overwrite. If this is the first > ever dgit push of the package, consider passing > --deliberately-not-fast-forward instead of --overwrite. This avoids > introducing a new origin commit into your git history. (This origin > commit would represent the most recent non-dgit upload of the package, > but this should already be represented in your git history.) This talks "first" twice. What makes "first" not "first ever"? This threw me out. Besides, "overwrite" sounds scary. Also, at the botton in "INCORPORATING NMUS", it aian recommend to use --overwrite. Normally, we don't overwrite things without fully understanding its impacts. Then I went back to the top of the page: "INTRODUCTION" to understand what is this doing. There,I saw "the information such aseries would contain is readily available from dgit-repos". This "dgit-repo" made me wonder what exactly is this. Is there anything more than upload queue and my salsa repo. All these lead me to read dgit(7). It looks like I did OK but I am not sure what exactly happened and where I sent the data. Osamu
