The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=eb875881553b5aa0a53ccfb02131ea254f4ee3b1
commit eb875881553b5aa0a53ccfb02131ea254f4ee3b1 Author: Mitchell Horne <[email protected]> AuthorDate: 2023-10-20 15:11:21 +0000 Commit: Mitchell Horne <[email protected]> CommitDate: 2023-10-20 15:12:02 +0000 Tweaks to libarchive's upgrade instructions I would like to use this file as an example of the FREEBSD-upgrade convention, see D42302. libarchive is picked somewhat arbitrarily as a longstanding piece of contrib software in FreeBSD. - Remove SVN references (HEAD/trunk) - Mention the vendor/libarchive git branch - Update link to import instructions - Remove $FreeBSD$ Reviewed by: mm, imp, emaste Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42308 --- contrib/libarchive/FREEBSD-upgrade | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/contrib/libarchive/FREEBSD-upgrade b/contrib/libarchive/FREEBSD-upgrade index 0689acff2599..0b5d4e921f49 100644 --- a/contrib/libarchive/FREEBSD-upgrade +++ b/contrib/libarchive/FREEBSD-upgrade @@ -1,25 +1,25 @@ -$FreeBSD$ - libarchive The source code is pulled with git: git clone git://github.com/libarchive/libarchive.git +The git branch for imports is named vendor/libarchive. + For the contrib directory files and directories were pruned by: - + sh -c 'for F in `cat FREEBSD-Xlist | grep -v FreeBSD`; do rm -rf ./$F ; done' You may check if there are any new files that we don't need and add them to FREEBSD-Xlist. -The instructions for importing new release and merging to HEAD can be found -at FreeBSD wiki: +The instructions for importing new release and merging to main can be found +in the Committers' Guide: - http://wiki.freebsd.org/SubversionPrimer/VendorImports + https://docs.freebsd.org/en/articles/committers-guide/#vendor-import-git -To make local changes to libarchive, simply patch and commit to the trunk -branch (aka HEAD). Never make local changes on the vendor branch. +To make local changes to libarchive, simply patch and commit to the main +branch. Never make local changes on the vendor branch. [email protected] -27-July-2012 +19-October-2023
