Path: csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From: Andrius Merkys <merkys@debian.org>
Newsgroups: linux.debian.maint.python
Subject: Re: Fixing upstream branch after tagging
Date: Mon, 05 Dec 2022 07:50:01 +0100
Message-ID: <FzdsB-8u23-1@gated-at.bofh.it>
References: <Fzcdb-8tmN-1@gated-at.bofh.it>
X-Mailbox-Line: From debian-python-request@lists.debian.org  Mon Dec  5 06:46:43 2022
Old-Return-Path: <andrius.merkys@gmail.com>
X-Amavis-Spam-Status: No, score=-6.751 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, LDO_WHITELIST=-5, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001] autolearn=ham autolearn_force=no
X-Policyd-Weight: using cached result; rate: -5.5
X-Gm-Message-State: ANoB5plVly0Ea2StAaWOb7SKM55uQylVuQNjMrvomH1GGHC9oXkK6szz PJywiKMOyS/PJVAxGuyFL8U=
X-Google-SMTP-Source: AA0mqf5omSLJbhaFN2dbXYLMzErhQhOVP+yft7FS4mwTz31nfw0XhgOEkuq/vJu4yQgLipNLktJB7g==
X-Received: by 2002:a19:ca08:0:b0:4a2:4eaa:9276 with SMTP id a8-20020a19ca08000000b004a24eaa9276mr26306942lfg.97.1670222787326; Sun, 04 Dec 2022 22:46:27 -0800 (PST)
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2
Content-Language: en-US
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
X-Mailing-List: <debian-python@lists.debian.org> archive/latest/20553
List-ID: <debian-python.lists.debian.org>
List-URL: <https://lists.debian.org/debian-python/>
List-Archive: https://lists.debian.org/msgid-search/af5a1eaa-38cd-553d-5d74-0588514a96b4@debian.org
Approved: robomod@news.nic.it
Lines: 22
Organization: linux.* mail to news gateway
Sender: robomod@news.nic.it
X-Original-Date: Mon, 5 Dec 2022 08:46:26 +0200
X-Original-Message-ID: <af5a1eaa-38cd-553d-5d74-0588514a96b4@debian.org>
X-Original-References: <CAOTq_2VC-1pS9aUR4zMgsNRWe6SPa9CmD1d43uD-F8+-r6pk6g@mail.gmail.com>
Xref: csiph.com linux.debian.maint.python: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