Re: go-team/packages/golang-k8s-client-go
On Tue, Jan 2, 2024 at 6:24 PM Jérémy Lal wrote: > > > > Le mar. 2 janv. 2024 à 11:18, Shengjing Zhu a écrit : >> >> On Tue, Jan 2, 2024 at 5:58 PM Jérémy Lal wrote: >> > >> > >> > >> > Le mar. 2 janv. 2024 à 06:50, Shengjing Zhu a écrit : >> >> >> >> On Tue, Jan 2, 2024 at 2:34 AM Jérémy Lal wrote: >> >> > >> >> > >> >> > >> >> > Le lun. 1 janv. 2024 à 19:29, Domenico Andreoli 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. > > > I know, but it did make a conflict. > What I've just managed to push had these options (debian/gbp.conf): > [DEFAULT] > debian-branch = debian/sid > dist = DEP14 > upstream-tag = v%(version)s > pristine-tar = True > pristine-tar-commit = True > upstream-tree = tag > > As you can see, upstream-vcs-tag is missing. > My mistake. However, using it in the first place was what I did, > and it ended up with a merge conflict - which was very frustrating, > since the repository didn't have any debian/ directory in its debian/sid > branch. > > I would like to use upstream-vcs-tag, per go-team policy, but I couldn't. > Once again, the simplest solution here is to delete that repository so I can > recreate it from scratch. I have verified locally, the following command works on 97eb8e49c6886aee6442b8f71b4d78300f11d4e0 commit, gbp import-orig --debian-branch=debian/sid /tmp/t/client-go-0.29.0.tar.gz --upstream-vcs-tag=v0.29.0 -- Shengjing Zhu
Re: go-team/packages/golang-k8s-client-go
Le mar. 2 janv. 2024 à 11:18, Shengjing Zhu a écrit : > On Tue, Jan 2, 2024 at 5:58 PM Jérémy Lal wrote: > > > > > > > > Le mar. 2 janv. 2024 à 06:50, Shengjing Zhu a écrit : > >> > >> On Tue, Jan 2, 2024 at 2:34 AM Jérémy Lal wrote: > >> > > >> > > >> > > >> > Le lun. 1 janv. 2024 à 19:29, Domenico Andreoli 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. I know, but it did make a conflict. What I've just managed to push had these options (debian/gbp.conf): [DEFAULT] debian-branch = debian/sid dist = DEP14 upstream-tag = v%(version)s pristine-tar = True pristine-tar-commit = True upstream-tree = tag As you can see, upstream-vcs-tag is missing. My mistake. However, using it in the first place was what I did, and it ended up with a merge conflict - which was very frustrating, since the repository didn't have any debian/ directory in its debian/sid branch. I would like to use upstream-vcs-tag, per go-team policy, but I couldn't. Once again, the simplest solution here is to delete that repository so I can recreate it from scratch. Jérémy
Re: go-team/packages/golang-k8s-client-go
On Tue, Jan 2, 2024 at 5:58 PM Jérémy Lal wrote: > > > > Le mar. 2 janv. 2024 à 06:50, Shengjing Zhu a écrit : >> >> On Tue, Jan 2, 2024 at 2:34 AM Jérémy Lal wrote: >> > >> > >> > >> > Le lun. 1 janv. 2024 à 19:29, Domenico Andreoli 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
Re: go-team/packages/golang-k8s-client-go
Le mar. 2 janv. 2024 à 06:50, Shengjing Zhu a écrit : > On Tue, Jan 2, 2024 at 2:34 AM Jérémy Lal wrote: > > > > > > > > Le lun. 1 janv. 2024 à 19:29, Domenico Andreoli 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. Jérémy
Re: go-team/packages/golang-k8s-client-go
On Tue, Jan 2, 2024 at 2:34 AM Jérémy Lal wrote: > > > > Le lun. 1 janv. 2024 à 19:29, Domenico Andreoli 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. -- Shengjing Zhu
Re: go-team/packages/golang-k8s-client-go
Le lun. 1 janv. 2024 à 19:29, Domenico Andreoli 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. Jérémy
Re: go-team/packages/golang-k8s-client-go
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. > > Thanks, > Jérémy Dom -- rsa4096: 3B10 0CA1 8674 ACBA B4FE FCD2 CE5B CF17 9960 DE13 ed25519: FFB4 0CC3 7F2E 091D F7DA 356E CC79 2832 ED38 CB05 signature.asc Description: PGP signature
