On Fri, May 15, 2020 at 1:13 PM Tong Sun <suntong...@users.sourceforge.net> wrote: > > On Fri, May 15, 2020 at 1:03 AM Shengjing Zhu <z...@debian.org> wrote: > > > > On Fri, May 15, 2020 at 1:00 PM Tong Sun > > <suntong...@users.sourceforge.net> wrote: > > > > > > On Fri, May 15, 2020 at 12:54 AM Tong Sun > > > <suntong...@users.sourceforge.net> wrote: > > > > > > > > On Fri, May 15, 2020 at 12:51 AM Shengjing Zhu <z...@debian.org> wrote: > > > > > > > > > > On Fri, May 15, 2020 at 12:44 PM Tong Sun > > > > > <suntong...@users.sourceforge.net> wrote: > > > > > > > > > > > > Hi, > > > > > > > > > > > > Please help review the following package: > > > > > > > > > > > > https://salsa.debian.org/go-team/packages/golang-k8s-sigs-structured-merge-diff > > > > > > > > > > > > > > > > Could you package the latest version, aka v3.0.0? > > > > > > > > Oh, shoot, actually my initial attempt was v3.0.0, but having checked > > > > https://github.com/kubernetes-sigs/structured-merge-diff/releases > > > > I reverted to that one. > > > > > > > > OK. will do... > > > > > > Can someone remove the > > > https://salsa.debian.org/go-team/packages/golang-k8s-sigs-structured-merge-diff > > > repo for me please? > > > > > > I tried but I can't do it myself. > > > > > > Please help, thanks > > > > It doesn't matter if you continue to push commits on top of the old ones. > > Hmm... I did in two entirely different git repos, > > First attempt was based on: > > 355fc6b (HEAD -> debian/sid) - [-] remove vendor directory > 9653092 Ignore quilt dir .pc via .gitignore > 52e4e0d (tag: upstream/3.0.0, upstream) New upstream version 3.0.0 > 877aee0 (tag: v3.0.0, k8s-sigs/master) Merge pull request #158 from > apelisse/return-nil-on-non-change-apply > c840d7e ManagedFields: Implement Copy method > ac8cf59 fieldpath.ManagedFields: Add Equals method > > While my 2nd was on an entirely different git repo: > > 2515b52 (HEAD -> debian/sid) Ignore quilt dir .pc via .gitignore > a6bb051 (tag: upstream/1.0.1, upstream) New upstream version 1.0.1 > 442c558 (tag: v1.0.1) Merge pull request #128 from > jennybuckley/fix-1.0-compare > 08cde4d Implement Compare methods > fa5e197 Implement equality for Values > 6149e45 (tag: v1.0.0) Merge pull request #98 from lavalamp/mempool > > I really have no idea how to merge one git on top of another (while > their hashes are so different), so removing salsa repo is the simplest > approach to me. (redoing everything again locally is not a big issue > to me, comparing to merging one git on top of another) > > wait, are you saying merely a `gbp import-orig --uscan` can bring me > out of the woods?
or `gbp import-orign --uscan --upstream-vcs-tag=v3.0.0` I think it's the easiest way. -- Shengjing Zhu
