Hi, On Sat, Jan 1, 2022 at 12:37 PM Federico Grau <donf...@casagrau.org> wrote: > > On Fri, Dec 31, 2021 at 10:30:30PM -0500, Federico Grau wrote: > > On Fri, Dec 31, 2021 at 02:21:11PM -0500, Federico Grau wrote: > > > On Fri, Dec 31, 2021 at 08:54:14AM -0800, tony mancill wrote: > > > > On Fri, Dec 31, 2021 at 11:11:03AM -0500, Federico Grau wrote: > > > ... > > > > > With wl2k v0.8.0-1 now in unstable, I'm now seeking an upload of pat > > > > > v0.12.0 > > > > > to hopefully close out this wave. > > > > > > > > I will review and sponsor an upload. Please push your pristine-tar > > > > branch and updated upstream branch to Salsa. At the moment, I only see > > > > the debian/sid and an outdated upstream branch [1]. > > > > > > Appreciate the review and feedback tony. I'll admit to still developing > > > familiarity with git and it's possible I missed a step. > ... > > > > Looking closer at the salsa git UI, I see that the `pat' upstream branch was > > last updated for v0.10.0 (and not the current v0.12.0). I'm pretty sure I > > progressed the update using "gbp import-orig", but may have missed an option > > or uploading to salsa all branches after the work. Unfortunately I've since > > whacked and rebuilt that dev environment. I'm exploring now how to update > > the > > upstream branch (while the debian/sid branch is already updated). > > > > > I believe I've identified steps to clean this up, but they require deleting a > git tag, which I'm hesitant to try doing (if it's even possible for me). > Performing these tests in my local dev environment they appear ok with no > changes to debian/sid as expected. I welcome feedback or confirmation to the > planned steps: > > a) Delete the existing "upstream/0.12.0" tag > git tag -d upstream/0.12.0 > > b) Re-run "gbp import-orig" to populate the upstream branch and create a new > tag > gbp import-orig -v --uscan --upstream-version=0.12.0 >
Just git checkout upstream git merge --ff upstream/0.12.0 -- Shengjing Zhu