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

Re: Fixing upstream branch after tagging

Path	csiph.com!1.us.feeder.erje.net!3.eu.feeder.erje.net!feeder.erje.net!news2.arglkargh.de!news.mixmin.net!aioe.org!news.servidellagleba.it!bofh.it!news.nic.it!robomod
From	Julian Gilbey <julian@d-and-j.net>
Newsgroups	linux.debian.maint.python
Subject	Re: Fixing upstream branch after tagging
Date	Mon, 05 Dec 2022 14:10:01 +0100
Message-ID	<Fzjol-8xOp-15@gated-at.bofh.it> (permalink)
References	<Fzcdb-8tmN-1@gated-at.bofh.it>
X-Original-To	Guðjón Guðjónsson <gudjon.i.gudjonsson@gmail.com>
X-Mailbox-Line	From debian-python-request@lists.debian.org Mon Dec 5 13:05:06 2022
Old-Return-Path	<julian@d-and-j.net>
X-Amavis-Spam-Status	No, score=-7.2 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, LDO_WHITELIST=-5] autolearn=ham autolearn_force=no
X-Policyd-Weight	using cached result; rate: -4.6
MIME-Version	1.0
Content-Type	text/plain; charset=iso-8859-1
Content-Disposition	inline
Content-Transfer-Encoding	8bit
X-Mailing-List	<debian-python@lists.debian.org> archive/latest/20554
List-ID	<debian-python.lists.debian.org>
List-URL	<https://lists.debian.org/debian-python/>
List-Archive	https://lists.debian.org/msgid-search/Y43sbaZGuZ/Svzg1@d-and-j.net
Approved	robomod@news.nic.it
Lines	43
Organization	linux.* mail to news gateway
Sender	robomod@news.nic.it
X-Original-Cc	debian-python <debian-python@lists.debian.org>
X-Original-Date	Mon, 5 Dec 2022 13:04:45 +0000
X-Original-Message-ID	<Y43sbaZGuZ/Svzg1@d-and-j.net>
X-Original-References	<CAOTq_2VC-1pS9aUR4zMgsNRWe6SPa9CmD1d43uD-F8+-r6pk6g@mail.gmail.com>
Xref	csiph.com linux.debian.maint.python:14692

Show key headers only | View raw

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

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