Author: emaste
Date: Tue Feb 25 22:15:25 2020
New Revision: 358323
URL: https://svnweb.freebsd.org/changeset/base/358323
Log:
Add a note about deleted files in OpenSSH upgrade instructions
Modified:
head/crypto/openssh/FREEBSD-upgrade
Modified: head/crypto/openssh/FREEBSD-upgrade
==============================================================================
--- head/crypto/openssh/FREEBSD-upgrade Tue Feb 25 22:03:30 2020
(r358322)
+++ head/crypto/openssh/FREEBSD-upgrade Tue Feb 25 22:15:25 2020
(r358323)
@@ -46,6 +46,11 @@
$ svn merge -cNNNNNN \^/vendor-crypto/openssh/dist .
+ A number of files have been deleted from FreeBSD's copy of ssh,
+ including rendered man pages (which have a .0 extension). When
+ svn prompts for these deleted files during the merge, choose 'r'
+ (leaving them deleted).
+
0A) Resolve conflicts. Remember to bump the version addendum in
version.h, and update the default value in ssh{,d}_config and
ssh{,d}_config.5.
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
