Hello,

I want to make an upload for xom package with a couple of fixes. I want
to use its packaging repository on salsa [1], but it is in somewhat
diverged state. The newest Debian version of xom is 1.2.10-1.1, but
repository on salsa has 1.2.10-1 (note incorrect git tag) plus a pair of commits on top of that which are not included in 1.2.10-1.1. To fix the
history on salsa these two commits have to be discarded and changes of 1.2.10-1.1 have to be applied on top of clean 1.2.10-1. However, I do
not know how to do that without force-pushing (forbidden on a protected branch).

Any ideas how to solve this?

[1] https://salsa.debian.org/java-team/xom

Best,
Andrius

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

On 8/25/21 11:17 AM, Andrius Merkys wrote:

Any ideas how to solve this?

Something like this may work.


Import the changes from the NMU:

gbp import-dsc /tmp/xom_1.2.10-1.1.dsc

Review the changes since -1:

git diff debian/1.2.10-1{,.1} debian/

Restore changes that were reverted by the NMU import.


Kind Regards,

Bas

--
GPG Key ID: 4096R/6750F10AE88D4AF1
Fingerprint: 8182 DE41 7056 408D 6146 50D1 6750 F10A E88D 4AF1

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

Hi Sebastiaan,

On 2021-08-25 12:32, Sebastiaan Couwenberg wrote:

Import the changes from the NMU:

gbp import-dsc /tmp/xom_1.2.10-1.1.dsc

Review the changes since -1:

git diff debian/1.2.10-1{,.1} debian/

Restore changes that were reverted by the NMU import.

Thanks, I will do as you have suggested.

Best,
Andrius

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