From nobody Fri Mar 04 18:36:39 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 4F60E19FFCFC for ; Fri, 4 Mar 2022 18:36:39 +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 4K9Glq0GGmz4gZj for ; Fri, 4 Mar 2022 18:36:39 +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 DDABE11887 for ; Fri, 4 Mar 2022 18:36:38 +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 224Iac9T065782 for ; Fri, 4 Mar 2022 18:36:38 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from www@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 224IacD2065781 for ports-bugs@FreeBSD.org; Fri, 4 Mar 2022 18:36:38 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: Fri, 04 Mar 2022 18:36:39 +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: jhale@FreeBSD.org X-Bugzilla-Status: Open X-Bugzilla-Resolution: X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: jhale@FreeBSD.org X-Bugzilla-Flags: maintainer-feedback+ merge-quarterly? X-Bugzilla-Changed-Fields: cc assigned_to 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=1646418999; 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=qOaCny6e1F+p1hWhYPcvqcixNc4FYDZzxTbw4Cwekg4=; b=ZS+KK7xEWM02XHY5G810PktxFdiC7sJ2eonjK+LVy1TFUzez8GZEPhihL15nZKpSYON+FV sVfWP6VC5KW6bmPsUmvTtgOngWefmsAOx6UcadVdIvF37KZQmUq0VQgJaiYh+MHtdxFAGA 14Heit2g7/g+kZl3apmj7sAgWS41e8BfUcgwIA2M2cRDeBDO4of/MqYJaFBY0/nV71lJOE SUSHtjOPHBW+73VqGKN502jVd49KM3IpYJgnFblFxZzLRsn+PQ3/T81P4qeQlZ9rbCVSbY w/sqTFm0N6jKHhdx5ADrSHeV2Fh1qdOUnDj7iEo220Kzsx09ca20bdccTxIxJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646418999; a=rsa-sha256; cv=none; b=q38OgFQcBVzSa+Eq/OnhZaqTJzzbR4P3XzvF8E+QfL2lUjFUlyReQK/UJk8uCPOa7UAyEZ y7VEGsTgHHsDOP4lNyLMhNPqHAjQgG4QgZcxqwwGgxCAg9AHur7t+QDRpwU8iyPKlwsl1/ uzx6Aq8klxTQShnUVYFNVBFXY87b60p/qhzvQilTpuqyT73ncSTZRzlWy+NEYSsi/HFLBx ydpea3ZA7GZhLDlsPIWET435qrKfhhFtMAnYa+WqFqzNO/Rz8myoCcqxKd+6rEPJ6Xr9A8 gGiyKUjkKZxbEAw24HH0wr4m0nIDNoP1QL5Z1wRkx6e+riFxQB5/rLokErroSQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D262148 Jason E. Hale changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |jhale@FreeBSD.org Assignee|ports-bugs@FreeBSD.org |jhale@FreeBSD.org --- Comment #7 from Jason E. Hale --- It will be easier to just use PATCH_SITES/PATCHFILES instead of adding the patches directly to the ports tree. I'll merge that into 2022Q1, then follo= w up with bug #262164. --=20 You are receiving this mail because: You are the assignee for the bug.=