From owner-svn-doc-all@freebsd.org Fri Dec 20 22:21:45 2019 Return-Path: Delivered-To: svn-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EF0A61E5897; Fri, 20 Dec 2019 22:21:45 +0000 (UTC) (envelope-from brooks@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47fjs564Xqz4WMb; Fri, 20 Dec 2019 22:21:45 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CA5585A9A; Fri, 20 Dec 2019 22:21:45 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBKMLj3b032219; Fri, 20 Dec 2019 22:21:45 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBKMLjoW032218; Fri, 20 Dec 2019 22:21:45 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201912202221.xBKMLjoW032218@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Fri, 20 Dec 2019 22:21:45 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r53701 - head/en_US.ISO8859-1/books/developers-handbook/policies X-SVN-Group: doc-head X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: head/en_US.ISO8859-1/books/developers-handbook/policies X-SVN-Commit-Revision: 53701 X-SVN-Commit-Repository: doc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire doc trees \(except for " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Dec 2019 22:21:46 -0000 Author: brooks (src,ports committer) Date: Fri Dec 20 22:21:45 2019 New Revision: 53701 URL: https://svnweb.freebsd.org/changeset/doc/53701 Log: Use "^" refer to the base URL of the SVN repository. Subversion has supported this syntax for many years. Reviewed by: bcr Differential Revision: https://reviews.freebsd.org/D21949 Modified: head/en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml Modified: head/en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml Thu Dec 19 04:10:01 2019 (r53700) +++ head/en_US.ISO8859-1/books/developers-handbook/policies/chapter.xml Fri Dec 20 22:21:45 2019 (r53701) @@ -242,12 +242,12 @@ tree prior to importing new sources is also needed: &prompt.user; cd head/contrib/foo -&prompt.user; svn merge --record-only svn_base/vendor/foo/dist@12345678 . +&prompt.user; svn merge --record-only ^/vendor/foo/dist@12345678 . &prompt.user; svn commit - where svn_base is the base - directory of your SVN repository, e.g., - svn+ssh://svn.FreeBSD.org/base. + With some shells, the ^ in the + above command may need to be escaped with a + backslash. @@ -337,7 +337,7 @@ should tag it for future reference. The best and quickest way is to do it directly in the repository: - &prompt.user; svn copy svn_base/vendor/foo/dist svn_base/vendor/foo/9.9 + &prompt.user; svn copy ^/vendor/foo/dist svn_base/vendor/foo/9.9 To get the new tag, you can update your working copy of @@ -361,7 +361,7 @@ &prompt.user; cd head/contrib/foo &prompt.user; svn update -&prompt.user; svn merge --accept=postpone svn_base/vendor/foo/dist +&prompt.user; svn merge --accept=postpone ^/vendor/foo/dist Resolve any conflicts, and make sure that any files that were added or removed in the vendor tree have been @@ -369,7 +369,7 @@ a good idea to check differences against the vendor branch: - &prompt.user; svn diff --no-diff-deleted --old=svn_base/vendor/foo/dist --new=. + &prompt.user; svn diff --no-diff-deleted --old=^/vendor/foo/dist --new=. tells SVN not to check files that are in the