[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

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



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


Reply to: