X-Recipient: archive-cygwin AT delorie DOT com X-Original-To: cygwin AT cygwin DOT com Delivered-To: cygwin AT cygwin DOT com 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 Date: Wed, 20 Jul 2022 09:07:23 +0100 From: Adam Dinwoodie To: cygwin AT cygwin DOT com Subject: Re: Outdated git-review package Message-ID: <20220720080723.ijpszbv2yyjswc65@lucy.dinwoodie.org> References: MIME-Version: 1.0 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 AT cygwin DOT 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: , Reply-To: cygwin AT cygwin DOT com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: cygwin-bounces+archive-cygwin=delorie DOT com AT cygwin DOT com Sender: "Cygwin" 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 -- Problem reports: https://cygwin.com/problems.html FAQ: https://cygwin.com/faq/ Documentation: https://cygwin.com/docs.html Unsubscribe info: https://cygwin.com/ml/#unsubscribe-simple