From nobody Thu Feb 24 00:16:16 2022 X-Original-To: ports-bugs@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 965FE19E534C for ; Thu, 24 Feb 2022 00:16:18 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K3tjs1Mbmz3Djs for ; Thu, 24 Feb 2022 00:16:17 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2610:1c1:1:606c::50:1d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7693A21CA9 for ; Thu, 24 Feb 2022 00:16:16 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org ([127.0.1.5]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id 21O0GG32010023 for ; Thu, 24 Feb 2022 00:16:16 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from www@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 21O0GGrW010022 for ports-bugs@FreeBSD.org; Thu, 24 Feb 2022 00:16:16 GMT (envelope-from bugzilla-noreply@freebsd.org) X-Authentication-Warning: kenobi.freebsd.org: www set sender to bugzilla-noreply@freebsd.org using -f From: bugzilla-noreply@freebsd.org To: ports-bugs@FreeBSD.org Subject: [Bug 262148] devel/git-review: Fails to run with git >= 2.3.40: fatal: --preserve-merges was replaced by --rebase-merges Date: Thu, 24 Feb 2022 00:16:16 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Ports & Packages X-Bugzilla-Component: Individual Port(s) X-Bugzilla-Version: Latest X-Bugzilla-Keywords: needs-qa X-Bugzilla-Severity: Affects Many People X-Bugzilla-Who: dereckson@gmail.com X-Bugzilla-Status: Open X-Bugzilla-Resolution: X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: ports-bugs@FreeBSD.org X-Bugzilla-Flags: maintainer-feedback- merge-quarterly? X-Bugzilla-Changed-Fields: flagtypes.name Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated List-Id: Ports bug reports List-Archive: https://lists.freebsd.org/archives/freebsd-ports-bugs List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-ports-bugs@freebsd.org X-BeenThere: freebsd-ports-bugs@freebsd.org MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645661777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9ki2K5TTlaQ5rugLDFAkqXm535r2USgxGW0ZZ33QqzA=; b=uzntoMqkRp1PMGoJrnjJiGEeNN4ZjHw7fK24igIiHAb+W0nYeo4hYzXrPJU5fsvPE7wqOV 0xVouBKsQTXNAgjk2qnWBgc9KS5uA0Cos/kPDbDjj/TqhjjZvVE9dgW0MjxTpIwe29/Z6F R8yue00JRl3aRrZkc5kB/xNMGUO/cTMCVkIuw3g8UgJG2593ALExrAxMPVHyvjexMzMCfn SFErvqFFuNJH5bNC7Ia1evgoKa9HyAZO6FlPxJ7OUTozQP0b+Pymyy7uP1K78vk38fHpNa CeoYSDaEZJhRY4GLDEKRAd0Pntk3lt6oTpoedYGcag4gs+9Fq7SKfBgXU1Tp2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645661777; a=rsa-sha256; cv=none; b=F9MZ0Es/tMRZRpFKx4QDRzEUxja9mAFtUCvtnezXfpnzFctabdVgf1HBgP5uwYOj7R20Z7 ms4nvh6TcD8njZCqCe3mQUurpcPrU/onUQHBFsA9H/jmCSJAPdlDEmRgtyzGwwDAEpZRuD x2C4lRpzJcQU7l4bBvzU+RglrRvIsg/ZzCTfLlZgtdIQNV0SJtlMShxKkCtR2vGaIYEUEr rFh8POh98NLeVVx9DMoCd0Ti7Hz+5yZrcJNxsqASZq9ci6Ffo6Na82sN6S0Yr3WfE2r7zU 7xk/jkdOtmhMv02Zs/DS84dGEsMkJf0Pr1PjbtTN6MiGmuWrrJBmPpa+DL+32Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D262148 dereckson@gmail.com changed: What |Removed |Added ---------------------------------------------------------------------------- Flags|maintainer-feedback?(dereck |maintainer-feedback- |son@gmail.com) | --- Comment #2 from dereckson@gmail.com --- Thanks for the patch. This fixes a bug reporting upstream at: https://storyboard.openstack.org/#!/story/2009690 Yes, this is indeed a problem we need to fix, as it breaks the workflow on recent Git. Meanwhile, on Fedora, they took another approach: take the current reposito= ry HEAD and create a 2.2.0 themselves with the fix you included in the patch a= nd everything else: $ git-review --version git-review version 2.2.0 Generally, on FreeBSD ports, patches have a goal to make the software build= and work with FreeBSD, for example because we need to amend paths or headers. The kind of solution you suggest offers instead to create a "=C3=A0 la Debi= an" backport: a Frankenstein software with some, but not all, features of more recent versions (here 2.21 + a patch from a future release). I'm going to ask the upstream to release a 2.22 now, that will be a lot eas= ier than to maintain a collection of patches. --=20 You are receiving this mail because: You are the assignee for the bug.=