From nobody Tue Mar 12 04:35:42 2024 X-Original-To: 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 4Tv16R1HHhz5DDZq for ; Tue, 12 Mar 2024 04:35:43 +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 4Tv16Q5lJGz4kpG for ; Tue, 12 Mar 2024 04:35:42 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710218142; a=rsa-sha256; cv=none; b=KIpu5CZSr+q61xfIr/KkcId244YSN6OP9TSTYPBTN/MxRgtRNEyFjw2fUP7LZDw/sVTCQb YK/jS521IeGfXvWboS0bg2Ct3pNFNJVr2jGRSdXn7Sj6FK9pj3SOQQjdCMdxr/tDF77icK QEqNaeRVzTVjfTxtP+dsj4HIXEiLQv7XmgO95h8Q69YxquJtUd2kCEtRR48NLFXqEhdi30 XhBAiGivxnoCbarNJis7g47QpYa2JLJFaTGqSE27CvM1+RsZTE/2eXwMxsG1S1Fil2PNKt GSoVJ6hFOvj2deOKezo/7blyDJAijBXZC5BstJORJ+HMZANCYda03E0NNm7igQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710218142; 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; bh=3zuk624PhryENjyDs/e1bzc9AdgFqhPtcVH8Z0NRqw4=; b=PznIQGs0fkf7qGlFVNGgM1n7gNMKZz2MlBGo8zwfV1S2ywAg3APAxcetFBSDK9XRuMDEXz vMb+1ZjofTOyQnc+H7zmXvnSKhZtGmlNH/RmSQQ1XPMd7eC245wMNoiZwFKxog8w1LtIIo 366Nd+6hylcU+bseEfT4NfWGzYYFG/cJ1Q7qwak9op5EjnF/nmbRTBFaYzy8aW3fq3rBYu L/UFGBeaBOXjwcka8tZ8+r/qYlGarzfNxLt4hsflQF+3SPgLFhNL4jVaoPK7DWwID1ODuv v+vZLWBICcUWsuGOG7xR2PFLyDKH/nVdsHWZ5fXP3bNQl1NXeobNXboCfXjztQ== 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 4Tv16Q5DmTz10Mw for ; Tue, 12 Mar 2024 04:35:42 +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 42C4ZgZ3061816 for ; Tue, 12 Mar 2024 04:35:42 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from www@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 42C4Zglx061814 for bugs@FreeBSD.org; Tue, 12 Mar 2024 04:35:42 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: bugs@FreeBSD.org Subject: [Bug 277646] patch no longer work for simple diff Date: Tue, 12 Mar 2024 04:35:42 +0000 X-Bugzilla-Reason: AssignedTo X-Bugzilla-Type: new X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Base System X-Bugzilla-Component: bin X-Bugzilla-Version: 13.3-RELEASE X-Bugzilla-Keywords: X-Bugzilla-Severity: Affects Many People X-Bugzilla-Who: jguojun@gmail.com X-Bugzilla-Status: New X-Bugzilla-Resolution: X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: bugs@FreeBSD.org X-Bugzilla-Flags: X-Bugzilla-Changed-Fields: bug_id short_desc product version rep_platform op_sys bug_status bug_severity priority component assigned_to reporter Message-ID: 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: Bug reports List-Archive: https://lists.freebsd.org/archives/freebsd-bugs List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-bugs@freebsd.org MIME-Version: 1.0 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D277646 Bug ID: 277646 Summary: patch no longer work for simple diff Product: Base System Version: 13.3-RELEASE Hardware: Any OS: Any Status: New Severity: Affects Many People Priority: --- Component: bin Assignee: bugs@FreeBSD.org Reporter: jguojun@gmail.com %mkdir a b %echo aaa > a/txt %echo bbb > b/txt # 13.3-R /usr/bin/patch failing case for normal simple diff, no matter if -= p# is used # patch at earlier versions of FreeBSD releases do not have this issue. %diff -r a b > ab.dif patch < ab.dif Hmm... Looks like a normal diff to me... The text leading up to this was: -------------------------- |diff -r a/txt b/txt -------------------------- File to patch: ^C # works well for context based and unified diff diff -ur a b > ab.dif patch < ab.dif Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |diff -ur a/txt b/txt |--- a/txt 2024-03-11 21:21:19.328439000 -0700 |+++ b/txt 2024-03-11 21:22:49.232518000 -0700 -------------------------- Patching file a/txt using Plan A... Hunk #1 succeeded at 1. done --=20 You are receiving this mail because: You are the assignee for the bug.=