Hi Samo, On Sat, Feb 15, 2025 at 1:54 AM Samo Pogačnik <samo_pogac...@t-2.net> wrote: > > Hi, > > and thanks for valuable information. I'll prepare changes in my private repo > first and let you know about them when prepared, if you agree? I hope to make > them soon, but it may take a while anyway. >
Ok, you can do this if you want, but in fact we are safe due to it is one git repo[0] [0]: https://salsa.debian.org/debian/git-subrepo > On Fri, 2025-02-14 at 09:38 +0800, Bo YU wrote: > > Hi, > > > > On Fri, Feb 14, 2025 at 2:02 AM Samo Pogačnik <samo_pogac...@t-2.net> wrote: > > > > > > Hi Bo, > > > [...] > > > > Ah, thanks for let me know this, I thought #979188 was one ITP by > > these wording[0], sorry.:) > > > > > So, now i am a bit confused about how to proceed and what would be the > > > correct > > > way to merge 0.4.9-3 and 0.4.9-2 to 0.4.9-2 in git/salsa (may i force push > > > or > > > not, may d/changelog for the same version change in git history - i > > > suppose > > > until not tagged?), if that would be way to go? > > > > Forcing push works, but now the git-subrepo was under debian project > > already, some developers do not wish force push when one package was > > adopted by a new maintainer. But I know the maintainer of the package > > is you, so you can do this as long as you know what you are doing. > > > > On the contrary, I would like to suggest you to push one new commit to > > debian/sid just like this: > > ``` > > --- a/debian/changelog > > +++ b/debian/changelog > > @@ -1,16 +1,11 @@ > > -git-subrepo (0.4.9-3) unstable; urgency=medium > > - > > - * d/control: update Standards-Version to 4.7.0 > > - * d/control: bump debhelper compat level to 13 > > - * d/control: added Multi-Arch: same > > - > > - -- Samo Pogačnik <samo_pogac...@t-2.net> Sat, 11 Jan 2025 17:41:16 +0000 > > - > > -git-subrepo (0.4.9-2) unstable; urgency=medium > > +git-subrepo (0.4.9-2) UNRELEASED; urgency=medium > > > > * Reordered and rewritten existing patches > > * Added patches to fix upstream PR checks > > * Fixing git-subrepo, when ff=only is set in git > > + * d/control: update Standards-Version to 4.7.0 > > + * d/control: bump debhelper compat level to 13 > > + * d/control: added Multi-Arch: same > > > > -- Samo Pogačnik <samo_pogac...@t-2.net> Fri, 10 Jan 2025 17:57:19 +0000 > > > > ``` > > I'll do that. > > > Some tips: > > 1. Personlly I will mark UNRELEASED tag when packaging or updating > > with new release was in progress, in other words, this will tell me > > there are some places to improve or to be finished, especially this is > > common usage on team workflow. When you get ready to get review or > > sponsorship, you can change it to `unstable`, but this up to your > > sponsor or your team. > > > > 2. Another point is that one commit contains one change with all > > involved modifications like[2][3]. You can just only modify your > > change but d/changelog and `git commit` the changes first then `gbp > > dch` will update your d/changelog at last use `git amend` to add the > > file to the commit. This is also a personal approach but this will > > prevent you from missing some entries in d/changelog I think. > > > Thanks, i'll try to follow those practices. I hope i understand them > correctly. > > > For git-subrepo itself[4], I think you can close them now? If so, > > please close the bug in the d/changelog. > > > > I suppose it is not allowed to append (Closes: #xxxxxx) to a changelog line of > an older already uploaded release? May i just add two more lines to your > proposed changelog change like this: > --- > * Improved test coverage (Closes: #1078960) > * New upstream release (Closes: #1081945) > --- I think it should be like: ``` > > -git-subrepo (0.4.9-2) unstable; urgency=medium > > +git-subrepo (0.4.9-2) UNRELEASED; urgency=medium > > > > * Reordered and rewritten existing patches (Closes: #1078960) > > * Added patches to fix upstream PR checks > > * Fixing git-subrepo, when ff=only is set in git > > + * d/control: update Standards-Version to 4.7.0 > > + * d/control: bump debhelper compat level to 13 > > + * d/control: added Multi-Arch: same >> + Acknowledge the previous upload. (Closes: #1081945) > > > > -- Samo Pogačnik <samo_pogac...@t-2.net> Fri, 10 Jan 2025 17:57:19 +0000 ``` But here, you must make sure: 1. Which entries to fix the #1078960, if not mention in d/chanelog please record it then to close the bug. But if #1078960 is not fixed in fact, please open it until it is fixed.I just suppose "Reordered and rewritten existing patches" will fix the bug, but maybe this is wrong. 2. For #1081945, you can close it like this, or send the bts cmd to close it. Hope this helps. BR, Bo
