On 15/10/2024 08:09, Otto Kekäläinen wrote:
Hi!
On Tue, 15 Oct 2024 at 00:05, Joachim Zobel <jz-2...@heute-morgen.de> 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 removed files. Is there a smart way to handle this?
Can you be specific on what conflicts you are getting? What package,
what operation?
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.
One useful operation is additional sources. I have one package that
upstream downloads additional git repos as dependencies. Capturing the
tarball (I have a patch to disable git actions) and _how_ additional
sources were added would be useful.
--
Alastair McKinstry,
GPG: 82383CE9165B347C787081A2CBE6BB4E5D9AD3A5
e: alast...@mckinstry.ie, im: @alastair:mckinstry.ie @amckins...@mastodon.ie
Commander Vimes didn’t like the phrase “The innocent have nothing to fear,”
believing the innocent had everything to fear, mostly from the guilty but in
the longer term
even more from those who say things like “The innocent have nothing to fear.”
- T. Pratchett, Snuff
