From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dalaran.tastycake.net (dalaran.tastycake.net [IPv6:2001:ba8:0:1c0::1:1]) by sourceware.org (Postfix) with ESMTPS id E0B2F385740C for ; Wed, 20 Jul 2022 08:07:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E0B2F385740C Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=dinwoodie.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=dinwoodie.org Received: from c.a.1.d.d.f.6.c.f.8.d.f.b.e.b.6.d.a.0.2.5.1.e.d.0.b.8.0.1.0.0.2.ip6.arpa ([2001:8b0:de15:20ad:6beb:fd8f:c6fd:d1ac] helo=lucy.dinwoodie.org) by dalaran.tastycake.net with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oE4js-0001iG-O2 for cygwin@cygwin.com; Wed, 20 Jul 2022 09:07:24 +0100 Received: from adam by lucy.dinwoodie.org with local (Exim 4.94.2) (envelope-from ) id 1oE4jr-00CX5U-NL for cygwin@cygwin.com; Wed, 20 Jul 2022 09:07:23 +0100 Date: Wed, 20 Jul 2022 09:07:23 +0100 From: Adam Dinwoodie To: cygwin@cygwin.com Subject: Re: Outdated git-review package Message-ID: <20220720080723.ijpszbv2yyjswc65@lucy.dinwoodie.org> Reply-To: cygwin@cygwin.com References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: cygwin@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: General Cygwin discussions and problem reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Jul 2022 08:07:29 -0000 On Wed, Jul 13, 2022 at 08:44:22AM +0000, Oledzki, Maciej (Nokia - PL/Wroclaw) wrote: > Hi, > > Latest git-review package available in Cygwin repository (2.1.0-1) is not compatible with latest git package (2.37.0-1). > Following error appears in during gerrit review: > > Errors running git rebase -p -i remotes/gerrit/master > fatal: --preserve-merges was replaced by --rebase-merges > > This problem is fixed in git review 2.2.0: > https://docs.opendev.org/opendev/git-review/latest/releasenotes.html#relnotes-2-2-0 > > It would be great if version 2.2.0 (or more recent) of git-review was available. Marco, are you able to get this updated? I've had a play with the current cygport file, and it looks like the update works trivially, although I haven't been able to set up a test environment to test it locally. My changes are at [0] if you want to see them, but I don't think there's anything very interesting. [0]: https://github.com/me-and/Cygwin-git-review/tree/prerelease Maciej, it looks like you should be able to install this yourself from PyPI or from the source itself. Alternatively I've prepared a Cygwin package that you should be able to install manually. Options: - If you have an appropriate version of `python*-pip` installed, run python3 -m pip install git-review - If you want to install from source yourself, it's available at https://opendev.org/opendev/git-review - If you want to use my tentative Cygwin build, make sure you have the curl, python39 and python39-setuptools packages installed, and the git-review package _uninstalled_, then run: curl -L https://github.com/me-and/Cygwin-git-review/releases/download/v2.3.1-1-prerelease.10.1/git-review-2.3.1-1.tar.xz | tar -xJC/ As above, I've not actually been able to test this package, so I can't provide any guarantees about it, but you're very welcome to give it a go! HTH Adam