From nobody Sun Jan 30 22:21:17 2022 X-Original-To: dev-commits-src-all@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 CEA271985A66; Sun, 30 Jan 2022 22:21:17 +0000 (UTC) (envelope-from git@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 4Jn5JF5V4pz3ng3; Sun, 30 Jan 2022 22:21:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643581277; 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=2APU+ByT0qRGUDhTYGdfoM4mOzX4h/UuwNlO5qEW2xs=; b=ezofxvHwRMJowefnYPu0+Sm8WQk6qN5OSvNKAWczB0UaE+2TBaXKpEkG7iORLFiJyyvHz+ bFH7vfnJlRnd4TQy3Z390GWyB5cvBSzA0IHtknOrkg2rlotdcoiKVfxai8KxTJ8fHlgXvy 9QwwwfnaJO4F8a1y38CmJWjaBEz1MgVNW5EhO6KNDmCWLjGWpc2payv2ADCuhTLy23qhTr 5nbX9ulBHo+HbwJB1D81LGipwXs5XJiFd8cYo7Yiy/ItNubt4d4X6Hq2wjHNNEVAVtsqEc PkcUeaiDCAvWBby9lwGiuxXABgKqQIvpDypEIaNdHJxlidt2BU8ZVyuYSi0kHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 9CC0D10BFB; Sun, 30 Jan 2022 22:21:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20UMLHqg061559; Sun, 30 Jan 2022 22:21:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20UMLHp7061542; Sun, 30 Jan 2022 22:21:17 GMT (envelope-from git) Date: Sun, 30 Jan 2022 22:21:17 GMT Message-Id: <202201302221.20UMLHp7061542@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gregory Neil Shapiro Subject: git: e58d0869c6cc - main - Update commit instructions. Still more TBD as I plan out the first git-based vendor import. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gshapiro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e58d0869c6cc9809bd0cf7c27708d2799c11eab3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643581277; 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=2APU+ByT0qRGUDhTYGdfoM4mOzX4h/UuwNlO5qEW2xs=; b=x+MjD+46a/lbJGKNc/33Ol3SxdmytWuESXfunjStMKGIWlNzcStleFLHJVvALAPz8YTiJS Xq9wSDBml98CQ0LEj+R02iZDTC+CTDam7OHXCSYC1PAqFSBE4vmPdzOVoH6XqB1IIJ4iGx lBupr8Oi6I2rQu8GaQQq+Jk78hf5Nihyimn5Y5bLi6hZ5sH5M52W44wZM4gP7QLz4SNELf JLPKgz+WsWI4HtppboprAMiMn+QhVpNoMV/CxGZEdJPMHZWgKNxmEriJycDYCHtXwXqPjb Y9jIub8GSEhoS5DxTY5EFMsPjIkmkyxwOZDYeVtAb+UElGHVpSuCqIyCxNLrWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643581277; a=rsa-sha256; cv=none; b=tKMeoBGVmr89eBcEkGD8Z1zJQjbDhdEsZZM+gA9QvbexrEdnfAwCsRzRbfhn4WdaYYC+Zc GD2fv9F2NgOpCXysXD40LP80sECKSbt8q3BRAJiw3S/X4XuF1qCn556WOVk19P19EyOcoT lBFztaeYjdVYLBhHBifRCpAvezf28+N5XJBU3XPEbTyzU0pV0xlxFkDMsgMaT+3NcflLYv xnno8t1OdEq9cJBcfffGq6WG9MoDZdMflBXYDc+s7P3mPv9pdxYK9eQsWaKmN++O+voSsq xNSHaOYMTJPApxBxTnL9dyb8J7aMczUEqPrwgNKfaQSeUcxm78JAQ5GhrA+8eA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gshapiro: URL: https://cgit.FreeBSD.org/src/commit/?id=e58d0869c6cc9809bd0cf7c27708d2799c11eab3 commit e58d0869c6cc9809bd0cf7c27708d2799c11eab3 Author: Gregory Neil Shapiro AuthorDate: 2022-01-30 22:20:12 +0000 Commit: Gregory Neil Shapiro CommitDate: 2022-01-30 22:20:12 +0000 Update commit instructions. Still more TBD as I plan out the first git-based vendor import. --- contrib/sendmail/FREEBSD-upgrade | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/contrib/sendmail/FREEBSD-upgrade b/contrib/sendmail/FREEBSD-upgrade index 1afee1bfd07c..c1741592caeb 100644 --- a/contrib/sendmail/FREEBSD-upgrade +++ b/contrib/sendmail/FREEBSD-upgrade @@ -9,26 +9,7 @@ For the import of sendmail, the following directories were renamed: Imported using the instructions at: -http://www.freebsd.org/doc/en_US.ISO8859-1/articles/committers-guide/subversion-primer.html - -Then merged using: - -% set FSVN=svn+ssh://repo.freebsd.org/base -% svn checkout $FSVN/head/contrib/sendmail head -% cd head -### Replace XXXXXX with import revision number in next command: -% svn merge -c rXXXXXX --accept=postpone '^/vendor/sendmail/dist' . -% svn resolve --accept working cf/cf/Build \ - cf/cf/generic-{bsd4.4,hpux{9,10},linux,mpeix,nextstep3.3,osf1,solaris,sunos4.1,ultrix4}.cf \ - devtools doc/op/op.ps editmap/editmap.0 mail.local/mail.local.0 mailstats/mailstats.0 \ - makemap/makemap.0 praliases/praliases.0 rmail/rmail.0 smrsh/smrsh.0 \ - src/{aliases,mailq,newaliases,sendmail}.0 vacation/vacation.0 -% svn propset -R svn:keywords FreeBSD=%H . -% svn propdel svn:keywords libmilter/docs/*.jpg -% svn diff --no-diff-deleted --old=$FSVN/vendor/sendmail/dist --new=. -% svn status -% svn diff -% svn commit +https://docs.freebsd.org/en/articles/committers-guide/#git-primer After importing, bump the version of src/etc/sendmail/freebsd*mc so mergemaster will merge /etc/mail/freebsd*cf by making a minor