Path: csiph.com!newsfeed.xs4all.nl!newsfeed8.news.xs4all.nl!bofh.it!news.nic.it!robomod
From: Andrius Merkys <merkys@debian.org>
Newsgroups: linux.debian.maint.java
Subject: Re: Divergence in salsa.debian.org/java-team/xom
Date: Wed, 25 Aug 2021 13:00:02 +0200
Message-ID: <CPYNs-BV-5@gated-at.bofh.it>
References: <CPXeF-8hA-7@gated-at.bofh.it> <CPXy2-8of-13@gated-at.bofh.it>
X-Mailbox-Line: From debian-java-request@lists.debian.org  Wed Aug 25 10:54:44 2021
Old-Return-Path: <andrius.merkys@gmail.com>
X-Amavis-Spam-Status: No, score=-7.805 tagged_above=-10000 required=5.3 tests=[BAYES_00=-2, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, LDO_WHITELIST=-5, NICE_REPLY_A=-1.305, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001] autolearn=ham autolearn_force=no
X-Policyd-Weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .gmail. - helo: .mail-lj1-f182.google. - helo-domain: .google.)  FROM/MX_MATCHES_HELO(DOMAIN)=-2; rate: -5.5
X-Gm-Message-State: AOAM532MGx9kE2bDZ/wEVacaXTS+9CioiVa6stqigL10N5SfMojsHMAG /rq7yVDHqe8lFNd1yJ247IIKvo0koDA=
X-Google-SMTP-Source: ABdhPJzvvvk6vjYrzgvkH1aBQ3NHSar0wO1ROrFG76LWAqKnxxWUSH4UI9X1ce0Xh8MHf6VmNTgDUQ==
X-Received: by 2002:a2e:2e16:: with SMTP id u22mr26072902lju.12.1629888869744; Wed, 25 Aug 2021 03:54:29 -0700 (PDT)
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
X-Mailing-List: <debian-java@lists.debian.org> archive/latest/22913
List-ID: <debian-java.lists.debian.org>
List-URL: <https://lists.debian.org/debian-java/>
List-Archive: https://lists.debian.org/msgid-search/d5afe4d1-43aa-daf5-3848-19b95d8c5c95@debian.org
Approved: robomod@news.nic.it
Lines: 17
Organization: linux.* mail to news gateway
Sender: robomod@news.nic.it
X-Original-Date: Wed, 25 Aug 2021 13:54:28 +0300
X-Original-Message-ID: <d5afe4d1-43aa-daf5-3848-19b95d8c5c95@debian.org>
X-Original-References: <93c4d42d-b376-6e6d-8cf9-7c7d97641c6d@debian.org> <8a540562-5b77-5018-15f7-26d14a054e95@xs4all.nl>
Xref: csiph.com linux.debian.maint.java:12284

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