Hello, On Wed 07 Jul 2021 at 02:36PM +09, Osamu Aoki wrote:
> 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. Okay. > 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. It's deliberately distinguishing between your first dgit push using this workflow, and the first ever dgit push of the package. For example, someone else might have NMUed your package using dgit long before you decided to switch. It should be more explicit. > 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. We should probably rename --overwrite. Thoughts? > 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. Ah. dgit-repos is pretty much just <https://browse.dgit.debian.org/>, a special git server. We should mention that in the workflow manpage. Please do share further suggestions/patches to the manpages. -- Sean Whitton
signature.asc
Description: PGP signature
