git: b338bdf7fb0d - stable/13 - openssh: remove mention of now-unused svn:keywords

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Ed Maste <emaste_at_FreeBSD.org>
Date: Fri, 20 Jan 2023 21:08:02 UTC

The branch stable/13 has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=b338bdf7fb0dfe771456a14cc4d8a08cc7b48033

commit b338bdf7fb0dfe771456a14cc4d8a08cc7b48033
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2023-01-16 14:52:00 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2023-01-20 21:07:27 +0000

    openssh: remove mention of now-unused svn:keywords
    
    Reported by:    gshapiro
    
    (cherry picked from commit 9b7eddfeed465d4062dbad178261b806e97d6b62)
---
 crypto/openssh/FREEBSD-upgrade | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade
index fedbd80a2e3c..c8603577a2a2 100644
--- a/crypto/openssh/FREEBSD-upgrade
+++ b/crypto/openssh/FREEBSD-upgrade
@@ -73,10 +73,7 @@
 
     $ git diff --diff-filter=M vendor/openssh/X.YpZ HEAD:crypto/openssh
 
-    Files that have modifications relative to the vendor code, and
-    only those files, must have the svn:keywords property set to
-    FreeBSD=%H and be listed in the 'keywords' file created by the
-    pre-merge script.
+    Review the diff for any unexpected changes.
 
 12) Run the configure script: