Re: Divergence in salsa.debian.org/java-team/xom

2021-08-25 Thread Andrius Merkys
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

Re: Divergence in salsa.debian.org/java-team/xom

2021-08-25 Thread Sebastiaan Couwenberg
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 i