Re: Files-Excluded with DEP-14

2024-10-25 Thread Sean Whitton
Hello, On Tue 15 Oct 2024 at 09:03am +02, Joachim Zobel wrote: > Hi. > > DEP-14 states under "About repacked upstream sources" that files that > are removed from repacked sources should not be in the upstream > branches. > > This does however create modify/delete conflicts when upstream modifies

Re: Files-Excluded with DEP-14

2024-10-15 Thread Andrey Rakhmatullin
On Tue, Oct 15, 2024 at 07:30:57PM -0700, Otto Kekäläinen wrote: > If you need to repack, you should have a spearate branch > 'upstream/latest' as the targets for merges from upstream tags, and > then from 'upstream/latest' you merge on 'debian/master' (which > following DEP-14 should be 'debian/la

Re: Files-Excluded with DEP-14

2024-10-15 Thread Otto Kekäläinen
Hi! On Tue, 15 Oct 2024 at 05:47, Joachim Zobel wrote: > > Am Dienstag, dem 15.10.2024 um 00:09 -0700 schrieb Otto Kekäläinen: > > I suspect you have something wrong with the branch structure, perhaps > > you are trying to remove files in actual upstream branch and not the > > "upstream import" b

Re: Files-Excluded with DEP-14

2024-10-15 Thread Joachim Zobel
Am Dienstag, dem 15.10.2024 um 18:20 +0500 schrieb Andrey Rakhmatullin: > I don't see a sane way to continue using this workflow but repack the > orig.tar. Thanks, this means that for us there is no easy way to remove files. Luckily there is no very important reason (copyright) for that. So we sim

Re: Files-Excluded with DEP-14

2024-10-15 Thread Andrey Rakhmatullin
On Tue, Oct 15, 2024 at 02:44:59PM +0200, Joachim Zobel wrote: > Am Dienstag, dem 15.10.2024 um 00:09 -0700 schrieb Otto Kekäläinen: > > I suspect you have something wrong with the branch structure, perhaps > > you are trying to remove files in actual upstream branch and not the > > "upstream impor

Re: Files-Excluded with DEP-14

2024-10-15 Thread Joachim Zobel
Am Dienstag, dem 15.10.2024 um 00:09 -0700 schrieb Otto Kekäläinen: > I suspect you have something wrong with the branch structure, perhaps > you are trying to remove files in actual upstream branch and not the > "upstream import" branch that has only one-way changes. The repository has an upstrea

Re: Files-Excluded with DEP-14

2024-10-15 Thread Alastair McKinstry
On 15/10/2024 08:09, Otto Kekäläinen wrote: Hi! On Tue, 15 Oct 2024 at 00:05, Joachim Zobel wrote: Hi. DEP-14 states under "About repacked upstream sources" that files that are removed from repacked sources should not be in the upstream branches. This does however create modify/delete conf

Re: Files-Excluded with DEP-14

2024-10-15 Thread Otto Kekäläinen
Hi! On Tue, 15 Oct 2024 at 00:05, Joachim Zobel wrote: > > Hi. > > DEP-14 states under "About repacked upstream sources" that files that > are removed from repacked sources should not be in the upstream > branches. > > This does however create modify/delete conflicts when upstream modifies > the

Files-Excluded with DEP-14

2024-10-15 Thread Joachim Zobel
Hi. DEP-14 states under "About repacked upstream sources" that files that are removed from repacked sources should not be in the upstream branches. This does however create modify/delete conflicts when upstream modifies the removed files. Is there a smart way to handle this? Sincerely, Joachim