Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.debian.maint.java > #12283

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

Path csiph.com!newsfeed.xs4all.nl!newsfeed8.news.xs4all.nl!bofh.it!news.nic.it!robomod
From Sebastiaan Couwenberg <sebastic@xs4all.nl>
Newsgroups linux.debian.maint.java
Subject Re: Divergence in salsa.debian.org/java-team/xom
Date Wed, 25 Aug 2021 11:40:02 +0200
Message-ID <CPXy2-8of-13@gated-at.bofh.it> (permalink)
References <CPXeF-8hA-7@gated-at.bofh.it>
X-Original-To debian-java@lists.debian.org
X-Mailbox-Line From debian-java-request@lists.debian.org Wed Aug 25 09:40:00 2021
Old-Return-Path <sebastic@xs4all.nl>
X-Amavis-Spam-Status No, score=-9.203 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, LDO_WHITELIST=-5, NICE_REPLY_A=-1.305, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001] autolearn=ham autolearn_force=no
X-Policyd-Weight using cached result; rate: -5.5
X-Greylist delayed 432 seconds by postgrey-1.36 at bendel; Wed, 25 Aug 2021 09:39:48 UTC
User-Agent Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0
MIME-Version 1.0
Content-Type text/plain; charset=utf-8
Content-Language en-US
Content-Transfer-Encoding 8bit
X-Cmae-Envelope MS4xfEa/YE07/dZ2sGgFktgxr0f+A3W3omgEVdXKAkRTdyOIaG1DEVXEsjSD5CJNZezEVVpTokMhOk/l5/iSdvX+VrME4EeN21DJTq0hXcDHCD+i0bZMDGob t3m1CvwXI55wHwinRKwbLGS+FNkwW4rhCVlPrJo9kSFfjM46wEj5cS1Lcpi6nu5mitdsQFH84nWLBQUbZN5getf7KlVDRMQtqDE=
X-Mailing-List <debian-java@lists.debian.org> archive/latest/22912
List-ID <debian-java.lists.debian.org>
List-URL <https://lists.debian.org/debian-java/>
List-Archive https://lists.debian.org/msgid-search/8a540562-5b77-5018-15f7-26d14a054e95@xs4all.nl
Approved robomod@news.nic.it
Lines 24
Organization linux.* mail to news gateway
Sender robomod@news.nic.it
X-Original-Date Wed, 25 Aug 2021 11:32:31 +0200
X-Original-Message-ID <8a540562-5b77-5018-15f7-26d14a054e95@xs4all.nl>
X-Original-References <93c4d42d-b376-6e6d-8cf9-7c7d97641c6d@debian.org>
Xref csiph.com linux.debian.maint.java:12283

Show key headers only | View raw


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

Back to linux.debian.maint.java | Previous | NextPrevious in thread | Next in thread | Find similar


Thread

Divergence in salsa.debian.org/java-team/xom Andrius Merkys <merkys@debian.org> - 2021-08-25 11:20 +0200
  Re: Divergence in salsa.debian.org/java-team/xom Sebastiaan Couwenberg <sebastic@xs4all.nl> - 2021-08-25 11:40 +0200
    Re: Divergence in salsa.debian.org/java-team/xom Andrius Merkys <merkys@debian.org> - 2021-08-25 13:00 +0200

csiph-web