From owner-svn-doc-all@FreeBSD.ORG Sun Apr 13 01:29:40 2014 Return-Path: Delivered-To: svn-doc-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9DD3A997; Sun, 13 Apr 2014 01:29:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8905813C4; Sun, 13 Apr 2014 01:29:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3D1TeRK052908; Sun, 13 Apr 2014 01:29:40 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3D1Te3O052907; Sun, 13 Apr 2014 01:29:40 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201404130129.s3D1Te3O052907@svn.freebsd.org> From: Warren Block Date: Sun, 13 Apr 2014 01:29:40 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r44543 - head/en_US.ISO8859-1/articles/committers-guide X-SVN-Group: doc-head 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.17 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: Sun, 13 Apr 2014 01:29:40 -0000 Author: wblock Date: Sun Apr 13 01:29:40 2014 New Revision: 44543 URL: http://svnweb.freebsd.org/changeset/doc/44543 Log: Recover lost tags. Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml Modified: head/en_US.ISO8859-1/articles/committers-guide/article.xml ============================================================================== --- head/en_US.ISO8859-1/articles/committers-guide/article.xml Sat Apr 12 13:20:00 2014 (r44542) +++ head/en_US.ISO8859-1/articles/committers-guide/article.xml Sun Apr 13 01:29:40 2014 (r44543) @@ -122,9 +122,9 @@ project repository has its own -developers and -committers mailing lists. Archives for these lists may be found in files - /home/mail/repository-name-developers-archive + /home/mail/repository-name-developers-archive and - /home/mail/repository-name-committers-archive + /home/mail/repository-name-committers-archive on the FreeBSD.org cluster.) @@ -454,8 +454,8 @@ You need a Passphrase to protect your se The most notable change is the location of the &os; website www tree, which has been moved from - www/lang/ to - head/lang/htdocs/. + www/lang/ to + head/lang/htdocs/. The &os; ports repository switched @@ -554,7 +554,7 @@ You need a Passphrase to protect your se The above command will check out a CURRENT source tree as - /usr/src/, which can be any target + /usr/src/, which can be any target directory on the local filesystem. Omitting the final argument of that command causes the working copy, in this case, to be named head, but that can be @@ -644,19 +644,19 @@ You need a Passphrase to protect your se /stable/n which corresponds to - RELENG_n. + RELENG_n. /releng/n.n which corresponds to - RELENG_n_n. + RELENG_n_n. /release/n.n.n which corresponds to - RELENG_n_n_n_RELEASE. + RELENG_n_n_n_RELEASE. @@ -735,7 +735,7 @@ You need a Passphrase to protect your se /branches/RELENG_n_n_n which corresponds to - RELENG_n_n_n + RELENG_n_n_n is used to merge back security updates in preparation for a release. @@ -743,7 +743,7 @@ You need a Passphrase to protect your se /tags/RELEASE_n_n_n which corresponds to - RELEASE_n_n_n + RELEASE_n_n_n represents a release tag of the ports tree. @@ -847,7 +847,7 @@ You need a Passphrase to protect your se to the main repository. To do this, use the following command: - &prompt.user; svn co https://svn0.us-west.FreeBSD.org/base/head /usr/src + &prompt.user; svn co https://svn0.us-west.FreeBSD.org/base/head /usr/src Select the closest mirror and verify the mirror server certificate from the list of &prompt.user; svn update -&prompt.user; svn update -r12345 +&prompt.user; svn update -r12345 @@ -892,11 +892,11 @@ You need a Passphrase to protect your se &prompt.user; svn commit To commit all changes in, for example, - lib/libfetch/ and - usr/bin/fetch/ in a single + lib/libfetch/ and + usr/bin/fetch/ in a single operation: - &prompt.user; svn commit lib/libfetch usr/bin/fetch + &prompt.user; svn commit lib/libfetch usr/bin/fetch There is also a commit wrapper for the ports tree to handle the properties and sanity checking your @@ -928,7 +928,7 @@ You need a Passphrase to protect your se add. To add a file named foo, edit it, then: - &prompt.user; svn add foo + &prompt.user; svn add foo Most new source files should include a @@ -944,7 +944,7 @@ You need a Passphrase to protect your se Files can be removed with svn remove: - &prompt.user; svn remove foo + &prompt.user; svn remove foo Subversion does not require deleting the file before using svn rm, and indeed complains if @@ -953,20 +953,20 @@ You need a Passphrase to protect your se It is possible to add directories with svn add: - &prompt.user; mkdir bar -&prompt.user; svn add bar + &prompt.user; mkdir bar +&prompt.user; svn add bar Although svn mkdir makes this easier by combining the creation of the directory and the adding of it: - &prompt.user; svn mkdir bar + &prompt.user; svn mkdir bar Like files, directories are removed with svn rm. There is no separate command specifically for removing directories. - &prompt.user; svn rm bar + &prompt.user; svn rm bar @@ -976,7 +976,7 @@ You need a Passphrase to protect your se foo.c named bar.c, with the new file also under version control: - &prompt.user; svn copy foo.c bar.c + &prompt.user; svn copy foo.c bar.c The example above is equivalent to: @@ -985,7 +985,7 @@ You need a Passphrase to protect your se To move and rename a file: - &prompt.user; svn move foo.c bar.c + &prompt.user; svn move foo.c bar.c @@ -1042,11 +1042,11 @@ You need a Passphrase to protect your se The simple, not yet deprecated procedure is the following: - &prompt.user; svn resolved foo + &prompt.user; svn resolved foo However, the preferred procedure is: - &prompt.user; svn resolve --accept=working foo + &prompt.user; svn resolve --accept=working foo The two examples are equivalent. Possible values for --accept are: @@ -1129,7 +1129,7 @@ You need a Passphrase to protect your se Thus, given the working copy produced by the previous example: - &prompt.user; cd ~/freebsd + &prompt.user; cd ~/freebsd &prompt.user; svn update --set-depth=immediates . The above command will populate the working copy in @@ -1141,7 +1141,7 @@ You need a Passphrase to protect your se head (in this case) to infinity, and fully populate it: - &prompt.user; svn update --set-depth=infinity head + &prompt.user; svn update --set-depth=infinity head @@ -1388,7 +1388,7 @@ You need a Passphrase to protect your se Changes to manual pages should be merged to - share/man/manN/, for the + share/man/manN/, for the appropriate value of N. @@ -1681,7 +1681,7 @@ U stable/9/share/man/man4/netmap.4 To flatten the pf tree: - &prompt.user; cd vendor/pf/dist/contrib/pf + &prompt.user; cd vendor/pf/dist/contrib/pf &prompt.user; svn mv $(svn list) ../.. &prompt.user; cd ../.. &prompt.user; svn rm contrib @@ -1726,8 +1726,8 @@ U stable/9/share/man/man4/netmap.4 that corresponds to the last related change to the vendor tree, prior to importing new sources: - &prompt.user; cd head/contrib/pf -&prompt.user; svn merge --record-only svn+ssh://svn.freebsd.org/base/vendor/pf/dist@180876 . + &prompt.user; cd head/contrib/pf +&prompt.user; svn merge --record-only svn+ssh://svn.freebsd.org/base/vendor/pf/dist@180876 . &prompt.user; svn commit @@ -1757,9 +1757,9 @@ U stable/9/share/man/man4/netmap.4 about to be imported is recommended, to facilitate the process. - &prompt.user; cd vendor/pf/dist + &prompt.user; cd vendor/pf/dist &prompt.user; svn list -R | grep -v '/$' | sort >../old -&prompt.user; cd ../pf-4.3 +&prompt.user; cd ../pf-4.3 &prompt.user; find . -type f | cut -c 3- | sort >../new With these two files, @@ -1774,14 +1774,14 @@ U stable/9/share/man/man4/netmap.4 Importing into the Vendor Tree Now, the sources must be copied into - dist and + dist and the svn add and svn rm commands should be used as needed: - &prompt.user; cd vendor/pf/pf-4.3 + &prompt.user; cd vendor/pf/pf-4.3 &prompt.user; tar cf - . | tar xf - -C ../dist -&prompt.user; cd ../dist +&prompt.user; cd ../dist &prompt.user; comm -23 ../old ../new | xargs svn rm &prompt.user; comm -13 ../old ../new | xargs svn --parents add @@ -1813,11 +1813,11 @@ U stable/9/share/man/man4/netmap.4 future reference. The best and quickest way to do this is directly in the repository: - &prompt.user; svn cp svn+ssh://svn.freebsd.org/base/vendor/pf/dist svn+ssh://svn.freebsd.org/base/vendor/pf/4.3 + &prompt.user; svn cp svn+ssh://svn.freebsd.org/base/vendor/pf/dist svn+ssh://svn.freebsd.org/base/vendor/pf/4.3 Once that is complete, svn up the working copy of - vendor/pf + vendor/pf to get the new tag, although this is rarely needed. @@ -1825,7 +1825,7 @@ U stable/9/share/man/man4/netmap.4 svn:mergeinfo results must be removed: - &prompt.user; cd vendor/pf + &prompt.user; cd vendor/pf &prompt.user; svn cp dist 4.3 &prompt.user; svn propdel svn:mergeinfo -R 4.3 @@ -1834,9 +1834,9 @@ U stable/9/share/man/man4/netmap.4 Merging to Head - &prompt.user; cd head/contrib/pf + &prompt.user; cd head/contrib/pf &prompt.user; svn up -&prompt.user; svn merge --accept=postpone svn+ssh://svn.freebsd.org/base/vendor/pf/dist . +&prompt.user; svn merge --accept=postpone svn+ssh://svn.freebsd.org/base/vendor/pf/dist . The --accept=postpone tells Subversion that it should not complain because merge @@ -1874,7 +1874,7 @@ U stable/9/share/man/man4/netmap.4 main tree. To check diffs against the vendor branch: - &prompt.user; svn diff --no-diff-deleted --old=svn+ssh://svn.freebsd.org/base/vendor/pf/dist --new=. + &prompt.user; svn diff --no-diff-deleted --old=svn+ssh://svn.freebsd.org/base/vendor/pf/dist --new=. The --no-diff-deleted tells Subversion not to complain about files that are in the @@ -1919,10 +1919,10 @@ U stable/9/share/man/man4/netmap.4 First, prepare the directory in vendor: - &prompt.user; svn co --depth immediates $FSVN/vendor -&prompt.user; cd vendor -&prompt.user; svn mkdir byacc -&prompt.user; svn mkdir byacc/dist + &prompt.user; svn co --depth immediates $FSVN/vendor +&prompt.user; cd vendor +&prompt.user; svn mkdir byacc +&prompt.user; svn mkdir byacc/dist Now, import the sources into the dist directory. @@ -1931,7 +1931,7 @@ U stable/9/share/man/man4/netmap.4 the imported version. To save time and bandwidth, direct remote committing and tagging is possible: - &prompt.user; svn cp -m "Tag byacc 20120115" $FSVN/vendor/byacc/dist $FSVN/vendor/byacc/20120115 + &prompt.user; svn cp -m "Tag byacc 20120115" $FSVN/vendor/byacc/dist $FSVN/vendor/byacc/20120115 @@ -1940,7 +1940,7 @@ U stable/9/share/man/man4/netmap.4 Due to this being a new file, copy it for the merge: - &prompt.user; svn cp -m "Import byacc to contrib" $FSVN/vendor/byacc/dist $FSVN/head/contrib/byacc + &prompt.user; svn cp -m "Import byacc to contrib" $FSVN/vendor/byacc/dist $FSVN/head/contrib/byacc Working normally on newly imported sources is still possible. @@ -2102,7 +2102,7 @@ U stable/9/share/man/man4/netmap.4 work that is beneficial to the &os; community in some way but not intended to be merged directly back into HEAD then the proper location is - base/user/your-name/. base/user/your-name/. This page contains further details. @@ -2262,7 +2262,7 @@ ControlPersist yes Add an entry for yourself to - src/share/misc/committers-repository.dot, + src/share/misc/committers-repository.dot, where repository is either doc, ports or src, depending on the commit privileges you obtained. @@ -2336,7 +2336,7 @@ ControlPersist yes Log into hub.FreeBSD.org and - create a /var/forward/user (where + create a /var/forward/user (where user is your username) file containing the e-mail address where you want mail addressed to @@ -2676,7 +2676,7 @@ Relnotes: yes areas, to our shame), the same applies. If, however, you are about to modify something which is clearly being actively maintained by someone else (and it is only by watching the - repository-committers mailing list that you + repository-committers mailing list that you can really get a feel for just what is and is not) then consider sending the change to them instead, just as you would have before becoming a committer. For ports, you should contact the @@ -2773,7 +2773,7 @@ Relnotes: yes for tracking bugs and change requests. Be sure that if you commit a fix or suggestion found in a GNATS PR, you use - edit-pr pr-number on + edit-pr pr-number on freefall to close it. It is also considered nice if you take time to close any PRs associated with your commits, if appropriate. You can also make use of @@ -2840,11 +2840,11 @@ Relnotes: yes command. For example, to assign PR 123456 to yourself type - take-pr 123456. + take-pr 123456. If you want to set the PR to patched awaiting an MFC at the same time use: change-pr -t -p -m "awaiting MFC" - 123456 + 123456 @@ -3020,7 +3020,7 @@ Relnotes: yes $HOME/.ssh/id_rsa.pub) to the person setting you up as a committer so it can be put into the - yourlogin + yourlogin file in /etc/ssh-keys/ on freefall. @@ -3824,7 +3824,7 @@ Relnotes: yes &prompt.root; make install &prompt.root; make package &prompt.root; make deinstall -&prompt.root; pkg_add package you built above +&prompt.root; pkg_add package you built above &prompt.root; make deinstall &prompt.root; make reinstall &prompt.root; make package @@ -3948,8 +3948,8 @@ Relnotes: yes and then copy the last living revision of the port: - &prompt.user; cd /usr/ports/category -&prompt.user; svn cp 'svn+ssh://svn.freebsd.org/ports/head/category/portname/@{YYYY-MM-DD}' portname + &prompt.user; cd /usr/ports/category +&prompt.user; svn cp 'svn+ssh://svn.freebsd.org/ports/head/category/portname/@{YYYY-MM-DD}' portname Pick a date that is before the removal but after the last true commit. @@ -4381,9 +4381,9 @@ Relnotes: yes To do this, use the chkorigin.sh tool, as follows: env - PORTSDIR=/path/to/ports + PORTSDIR=/path/to/ports sh -e - /path/to/ports/Tools/scripts/chkorigin.sh. + /path/to/ports/Tools/scripts/chkorigin.sh. This will check every port in the ports tree, even those not connected to the build, so you can run it directly after the move