Path: csiph.com!newsfeed.xs4all.nl!newsfeed8.news.xs4all.nl!bofh.it!news.nic.it!robomod From: Andrius Merkys Newsgroups: linux.debian.maint.java Subject: Divergence in salsa.debian.org/java-team/xom Date: Wed, 25 Aug 2021 11:20:01 +0200 Message-ID: X-Mailbox-Line: From debian-java-request@lists.debian.org Wed Aug 25 09:18:05 2021 Old-Return-Path: X-Amavis-Spam-Status: No, score=-6.5 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, 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-lf1-f43.google. - helo-domain: .google.) FROM/MX_MATCHES_HELO(DOMAIN)=-2; rate: -5.5 X-Gm-Message-State: AOAM5328w557EiH5Vc+1W18GA3YxSfhiHIwG26ujIZ5F8oy4seqxUKNT zguNt+AkVBXqSnQ0LJ1Bq/t75Jb3sAk= X-Google-SMTP-Source: ABdhPJwJWakdPBjLo7vmau948BxR2u7FdlqZ84ZQHdaHW6YZvtLCW6+eQGCu3VlzFkhjU9jq0aPX/g== X-Received: by 2002:a19:ad46:: with SMTP id s6mr12259661lfd.25.1629883069418; Wed, 25 Aug 2021 02:17:49 -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: archive/latest/22911 List-ID: List-URL: List-Archive: https://lists.debian.org/msgid-search/93c4d42d-b376-6e6d-8cf9-7c7d97641c6d@debian.org Approved: robomod@news.nic.it Lines: 18 Organization: linux.* mail to news gateway Sender: robomod@news.nic.it X-Original-Date: Wed, 25 Aug 2021 12:17:48 +0300 X-Original-Message-ID: <93c4d42d-b376-6e6d-8cf9-7c7d97641c6d@debian.org> Xref: csiph.com linux.debian.maint.java:12282 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