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

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)

Hi!

On Tue, 15 Oct 2024 at 00:05, Joachim Zobel <[email protected]> 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.

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)

On 15/10/2024 08:09, Otto Kekäläinen wrote:

Hi!

On Tue, 15 Oct 2024 at 00:05, Joachim Zobel <[email protected]> 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: [email protected], im: @alastair:mckinstry.ie @[email protected]

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

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)

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 upstream branch and a debian branch. The upstream
branch is pulled via git from upstream.

Sinerely,
Joachim

This is about https://salsa.debian.org/debian-iot-team/mosquitto

(Send to list separately because I forgot to cc)

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)

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 import" branch that has only one-way changes.

The repository has an upstream branch and a debian branch. The upstream branch is pulled via git from upstream.

I don't see a sane way to continue using this workflow but repack the
orig.tar.


--
WBR, wRAR

-----BEGIN PGP SIGNATURE-----

iQJhBAABCgBLFiEEolIP6gqGcKZh3YxVM2L3AxpJkuEFAmcObDotFIAAAAAAFQAP cGthLWFkZHJlc3NAZ251cGcub3Jnd3JhckBkZWJpYW4ub3JnAAoJEDNi9wMaSZLh /d0P/0pAhbdYWwcp+IH+vE0O3E1fq1Ivm4HqVIlMsYeMTTEWaJeIfq9byFZqemhs y+3yYn7r+XQmwTmq9ZTApv5QpXfRg4Lop/WbYpgnw9YHefoB4Wq+eP5EX1YX9Lzu QamDBRXR7ctmLznnU3X4rbd1xKAAwS7oBWz3zCPAMcxr+anwWzPJdeYCdul4qD/w j+me0nvPnkzerUnKPwuD9571v3msdeTMPQd6mcOv8hrLX6PqAlmQsD9xKAynQ1xZ l6pchEHjoxYtFGYk90u75x6rz+e+IzhAXa9WIcUMBxKfu+jt8HK8Qiu5kEW1Mi6X a118VQztZkuOD18xtcLSHsH0XdPNivgDZXPjjg0z6eNRHn6pa9yd+MAHOFrnsSuE yZanYwHXevjhMoSuNCCsyVB3wDWlydOOanARu7qYdMZ4jACvPTWsrqG1uHzVAScn CX21U1ghWt49PmLU3pn/jhoZiVAFYJ3tZY5I8k8uKaUlI1FHTun1y2QX4yryNF0k KJj48mCiY4bISGv3nvzmR7yajIk7HCRCRt0IQGu9Q2cQ/WTRdTJDFPnVTA/26bO7 WJBosw6XEzNcPTis7KmKrvoYscgbYyibNwuFkvzS9jpbmvYIDirpAyOZvDlzNNSO yqcc789ctQWxc/yspPUFlZ7UVhmft9I1idqp8+xIuvJHJ16w
=dQho
-----END PGP SIGNATURE-----

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)

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
simply won't remove them.

Thanks,
Joachim

--
Papier ist gebundenes CO2. Bitte drucken Sie diese EMail aus und
archivieren Sie sie.



--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)

Hi!

On Tue, 15 Oct 2024 at 05:47, Joachim Zobel <[email protected]> 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" branch that has only one-way changes.

The repository has an upstream branch and a debian branch. The upstream branch is pulled via git from upstream.

Sinerely,
Joachim

This is about https://salsa.debian.org/debian-iot-team/mosquitto

I can see https://salsa.debian.org/debian-iot-team/mosquitto/-/blob/debian/master/debian/gbp.conf
that has:

[DEFAULT]
debian-branch=debian/master
upstream-branch=master
filter=*/.git
upstream-tag=v%(version)s

There is no README.source so I am not sure how you do the import, but
based on https://salsa.debian.org/debian-iot-team/mosquitto/-/commit/5d08142299dc7a7db79883a2fcdc615eb326817c
you merged branch 'master' directly on 'debian/master'.

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/latest' btw).

[DEFAULT]
debian-branch = debian/latest
upstream-branch = upstream/latest
upstream-tag = upstream/%(version)s
upstream-vcs-tag = v%(version%~%.)s

Note that the upstream-branch and upstream-tag refers to things
created by Debian to reference the incoming upstream stuff. Only the upstream-vcs-tag should point to something that actually already
exists in the upstream repository
https://github.com/eclipse/mosquitto/ you are pulling from. To make it
more clear, perhaps git-buildpackage should rename these to
import-branch and import-tag so people won't use
upstream-branch=master like you did, as it isn't supposed to mean the
actual upstream master branch, only the branch used for the package in
Debian.

Note: I didn't test this setup, I am just writing about what I assume
the setup should be, but it should still be tested to validate it
works in your use case.

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)

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/latest' btw).

And if upstream/latest has a file removed while master has that file
modified, there will be a conflict.

Note that the upstream-branch and upstream-tag refers to things
created by Debian to reference the incoming upstream stuff. Only the upstream-vcs-tag should point to something that actually already
exists in the upstream repository
https://github.com/eclipse/mosquitto/ you are pulling from. To make it
more clear, perhaps git-buildpackage should rename these to
import-branch and import-tag so people won't use
upstream-branch=master like you did, as it isn't supposed to mean the
actual upstream master branch, only the branch used for the package in Debian.

Using the upstream tags directly is officially supported: https://honk.sigxcpu.org/projects/git-buildpackage/manual-html/gbp.import.upstream-git.html#gbp.import.upstream.git.notarball

--
WBR, wRAR

-----BEGIN PGP SIGNATURE-----

iQJhBAABCgBLFiEEolIP6gqGcKZh3YxVM2L3AxpJkuEFAmcPXcstFIAAAAAAFQAP cGthLWFkZHJlc3NAZ251cGcub3Jnd3JhckBkZWJpYW4ub3JnAAoJEDNi9wMaSZLh M1oQAIeZNpk/HS/VRXNUHvcFxR16J47I5hL/wmKv1RULDKalVuWN4HxYkHWDGGcs taRsVT0+xwbeEDmJNF+UuhIRArbx9TLPINHp/DvU0bDmW6/X1NTShUA31LJ7L5eQ /vlfD0DVAhvTquJL99Gf7gXOLYQ92WR1haV8e2Hk+QGPWK+Q4naEbqxvozSOCn2r qbNUYYErnp1LnB14if1ptg2lxXCBxHTjTJoRr4RINo87VSjJqzDprjRqDcGr6mVq qlU6t5KcNqhp+suqF2YpnU1oFOGTVTNlB8+SFwO3O1+C19wEK/HeF1COL0Fb90vy lYXcOjS0u4cdw8z8JIMAzito0HjfpCBfjzVetfYOgGglRUYi++STk/x0DshengHm wjYXJFKOHYXNy1NWUCGdN/LLoOCVEDa2nbLCHMj0SMxdO5F+t+EhkBB6nYeO8I+K 4rfO0ONifVUUjHiKdm5jXg+X0HBXMVyT4JnQGt2Mmx/yZsR7Xe0URNblZSRTaP/W yPc34jNXnMVkT1QwLdUhbzt6DHf+5kxl9e5lztQlLNvts4C3Z64psMuoqitTJKC8 BmHBg8vPnXSD4E/LP+VO1xeSFlNTXmVxMU0KQGEQeGPF7vqIUiU3xO+fEbowwQJQ 4scN82tVN1rvwZtD1n3r6OrZQ38UjWvIcQg/xpU7PGYGNtSk
=F2+t
-----END PGP SIGNATURE-----

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)

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
the removed files. Is there a smart way to handle this?

There are some notes on a few ways to do this in dgit-maint-merge(7) and dgit-maint-debrebase(7).

--
Sean Whitton

--- SoupGate-Win32 v1.05
* Origin: fsxNet Usenet Gateway (21:1/5)