Groups > linux.debian.maint.python > #14693

Re: Fixing upstream branch after tagging

Path	csiph.com!weretis.net!feeder8.news.weretis.net!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod
From	Guðjón Guðjónsson <gudjon.i.gudjonsson@gmail.com>
Newsgroups	linux.debian.maint.python
Subject	Re: Fixing upstream branch after tagging
Date	Tue, 06 Dec 2022 07:10:01 +0100
Message-ID	<Fzzjr-8HAK-11@gated-at.bofh.it> (permalink)
References	<Fzcdb-8tmN-1@gated-at.bofh.it> <Fzjol-8xOp-15@gated-at.bofh.it>
X-Mailbox-Line	From debian-python-request@lists.debian.org Tue Dec 6 06:06:03 2022
Old-Return-Path	<gudjon.i.gudjonsson@gmail.com>
X-Amavis-Spam-Status	No, score=-4.178 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=2, LDO_WHITELIST=-5, MISSING_HEADERS=1.021, RCVD_IN_DNSWL_NONE=-0.0001] autolearn=no autolearn_force=no
X-Policyd-Weight	using cached result; rate: -5.5
X-Gm-Message-State	ANoB5pkvip8J/bzqQ42cKb2oL2c+W9YsscaQdAMQv4Dz09rbZ4rpnym/ 0RJhPCiCqfaIi5Be5Gg6X9BYX42DXlfnBpPrujC2/Crg
X-Google-SMTP-Source	AA0mqf6n7F0lvlWpfzsgnrj9K17OF5zR6mhmVwiOesA8MvQnLdo4yhHlxuBzpKCPUG18oRDp1jEq4eBu2B2md/aahrg=
X-Received	by 2002:ae9:e501:0:b0:6fb:a0ec:c5b8 with SMTP id w1-20020ae9e501000000b006fba0ecc5b8mr74916120qkf.316.1670306741364; Mon, 05 Dec 2022 22:05:41 -0800 (PST)
MIME-Version	1.0
Content-Type	multipart/alternative; boundary="000000000000fc2c2605ef229732"
X-Mailing-List	<debian-python@lists.debian.org> archive/latest/20555
List-ID	<debian-python.lists.debian.org>
List-URL	<https://lists.debian.org/debian-python/>
List-Archive	https://lists.debian.org/msgid-search/CAOTq_2W78_TYS0H909amQxXw7VMibnEqQBw7+p2TyCEiehFFpw@mail.gmail.com
Approved	robomod@news.nic.it
Lines	138
Organization	linux.* mail to news gateway
Sender	robomod@news.nic.it
X-Original-Cc	debian-python <debian-python@lists.debian.org>
X-Original-Date	Tue, 6 Dec 2022 07:05:35 +0000
X-Original-Message-ID	<CAOTq_2W78_TYS0H909amQxXw7VMibnEqQBw7+p2TyCEiehFFpw@mail.gmail.com>
X-Original-References	<CAOTq_2VC-1pS9aUR4zMgsNRWe6SPa9CmD1d43uD-F8+-r6pk6g@mail.gmail.com> <Y43sbaZGuZ/Svzg1@d-and-j.net>
Xref	csiph.com linux.debian.maint.python:14693

Show key headers only | View raw

[Multipart message — attachments visible in raw view] - view raw

Thanks Andrius and Julian

Forgot to mention that I had already pushed my changes.
I will try to adapt to the new git standard but that will be my Christmas
project.
Julian, your solution with a new tag worked perfectly but I won't push my
changes until it is lintian clean.

Regards
Gudjon


On Mon, Dec 5, 2022 at 1:04 PM Julian Gilbey <julian@d-and-j.net> wrote:

> On Mon, Dec 05, 2022 at 06:24:48AM +0000, Guðjón Guðjónsson wrote:
> > Hi list
> > I am working on eric and I made a mistake while updating the git
> repository.
> > Some paths have changed so files were not excluded correctly and now
> upstream
> > and pristine-tar contain jquery*.js files.
> > How can I remove the files after having tagged?
> > I read that the pristine-tar branch should be removed [1]. Is that
> correct?
> > Regards
> > Gudjon
>
> Hi Gudjon,
>
> It depends on whether you have pushed to a remote repository yet, or
> whether it's still only on your local machine.  If you've already
> pushed, then you'll have to update your local versions and give it a
> different version number (for example, +ds2 rather than +ds1), doing a
> fresh gbp import-orig on the repacked source package.
>
> If you're still only on your local machine, this is an error I have
> made a number of times, only noticing after doing gpb import-orig.  To
> fix it, you can roll back the gbp import-orig.  With care, do the
> following (where git co is shorthand for git checkout):
>
> git co debian/unstable  [or whatever your branch is]
> git log
> git reset --hard <commit ref of commit just before the gbp import-orig>
>
> git co upstream
> git log
> git reset --hard <commit ref of commit just before the gbp import-orig>
>
> git co pristine-tar
> git log
> git reset --hard <commit ref of commit just before the gbp import-orig>
>
> git tag -d upstream/<upstream version number of wrongly imported package>
>
>
> There is probably a better way to do it, but this has worked for me.
>
> Good luck!
>
>    Julian
>

Back to linux.debian.maint.python | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

Fixing upstream branch after tagging Guðjón Guðjónsson <gudjon.i.gudjonsson@gmail.com> - 2022-12-05 06:30 +0100
  Re: Fixing upstream branch after tagging Andrius Merkys <merkys@debian.org> - 2022-12-05 07:50 +0100
  Re: Fixing upstream branch after tagging Julian Gilbey <julian@d-and-j.net> - 2022-12-05 14:10 +0100
    Re: Fixing upstream branch after tagging Guðjón Guðjónsson <gudjon.i.gudjonsson@gmail.com> - 2022-12-06 07:10 +0100

csiph-web