Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.debian.maint.python > #14690 > unrolled thread

Fixing upstream branch after tagging

Back to article view | Back to linux.debian.maint.python

Contents

  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

#14690 — Fixing upstream branch after tagging

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

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

1) https://go-team.pages.debian.net/workflow-changes.html

[toc] | [next] | [standalone]

#14691

Hi Guðjón,

On 2022-12-05 08:24, Guðjón Guðjónsson wrote:
> 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?

I would suggest repacking the source package [2] (see starting from 
"Copyright"). Branches 'upstream' and 'pristine-tar' should not be 
modified manually.

> 1) https://go-team.pages.debian.net/workflow-changes.html 
> <https://go-team.pages.debian.net/workflow-changes.html>

[2] https://wiki.debian.org/Repacking#Copyright

Hope this helps,
Andrius

[toc] | [prev] | [next] | [standalone]

#14692

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

[toc] | [prev] | [next] | [standalone]

#14693

[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
>

[toc] | [prev] | [standalone]

Back to top | Article view | linux.debian.maint.python

csiph-web