mirror of
https://github.com/freebsd/freebsd-src
synced 2024-07-21 10:19:04 +00:00
Add a note about deleted files in OpenSSH upgrade instructions
This commit is contained in:
parent
f55185bcd8
commit
99b201c331
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=358323
|
@ -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.
|
||||
|
|
Loading…
Reference in a new issue