On Tue, Jan 2, 2024 at 5:58 PM Jérémy Lal <kapo...@melix.org> wrote: > > > > Le mar. 2 janv. 2024 à 06:50, Shengjing Zhu <z...@debian.org> a écrit : >> >> On Tue, Jan 2, 2024 at 2:34 AM Jérémy Lal <kapo...@melix.org> wrote: >> > >> > >> > >> > Le lun. 1 janv. 2024 à 19:29, Domenico Andreoli <ca...@debian.org> a écrit >> > : >> >> >> >> On Sun, Dec 31, 2023 at 01:03:11AM +0100, Jérémy Lal wrote: >> >> > Hi, >> >> >> >> Hi Jérémy, >> >> >> >> > I'd like to work on that package, however you left the repository in a >> >> > protected state, so I just can't fix it. >> >> > >> >> > Either of those will work for me: >> >> > - delete the repository >> >> > - give to all other DD admin access to that project >> >> > - unprotect branches so I can merge latest tag and force push >> >> > (currently I >> >> > can't merge upstream branch to debian/sid branch). >> >> >> >> >> >> I'm not an admin of that project, you can ask on >> >> debian-go@lists.debian.org for help. >> >> >> >> I suggest you to work on a private repository until you settled with >> >> the development flow so that you can scrap it as needed. >> > >> > >> > Sorry, I thought you created that repository. >> > It's in a non-usable state (git merge to a more recent version will >> > conflict, for some reason), >> > so the best way forward would be to drop it so I can re-create it. >> > >> >> No, the repo is good, please don't force push it. >> >> Please use the `gbp import-orig --upstream-vcs-tag` option to import >> upstream new versions. > > > Right ! I must have forgotten something the first time I tried this. > Since then I've put the right switches in debian/gbp.conf anyway, > so a simple gbp import-orig works. >
Please be aware of the `--upstream-vcs-tag` option I explicitly mentioned. It imports upstream commits. > Jérémy -- Shengjing Zhu
