Sean Whitton <spwhitton@spwhitton.name> writes: > Hello, > > On Sat 28 Dec 2024 at 02:16am -08, Xiyue Deng wrote: > >> Sean Whitton <spwhitton@spwhitton.name> writes: >> >>> Hello, >>> >>> On Fri 27 Dec 2024 at 03:37pm -08, Xiyue Deng wrote: >>> >>>> So I guess the suggested workflow for git-debrebase when upgrading would >>>> be: >>>> * Run `git debrebase new-upstream <version>`. >>>> * Do necessary change in debian/. >>>> * Run `git debrebase quick` to stitch. >>>> >>>> Does this make sense? >>> >>> I think 'git debrebase conclude'. If you are uploading the package >>> yourself, don't run this manually, let dgit do it. >>> >> >> Hmm, the manpage seems to suggest that conclude should still be run >> before `dgit push-source' as quoted below: >> >> ,---- >> | git debrebase conclude && dgit push-source # source-only upload >> `---- >> >> Is it something that newer dgit handles now? > > I don't think my tutorial manpage tells you to do that. > Ah, I think I found the part you were referring to in dgit-maint-debrebase(7): ,---- | Right before uploading, if you did not just already do so, you | might want to have git-debrebase(1) shuffle your branch such that | the Debian delta queue appears right at the tip of the branch you | will push: | | % git debrebase | % dgit push-source | | Note that this will introduce a new pseudomerge. | | After dgit pushing, be sure to git push to salsa.debian.org, if | you're using that. `---- So I guess I'll need to remember to do `dgit push-source' before pushing to Salsa. > -- > Sean Whitton -- Regards, Xiyue Deng
Attachment:
signature.asc
Description: PGP signature