From 2bed4d50064019fdc6fd9b6d0b6dcb98abca3e86 Mon Sep 17 00:00:00 2001 From: Xin LI Date: Tue, 14 Jul 2015 23:38:20 +0000 Subject: [PATCH] s/svn.freebsd.org/repo.freebsd.org/ when appropriate. I have left the mirroring portion out because it's svn://, not svn+ssh:// and may be different. --- .../articles/committers-guide/article.xml | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/en_US.ISO8859-1/articles/committers-guide/article.xml b/en_US.ISO8859-1/articles/committers-guide/article.xml index 49b26d714b..a0dd38b594 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.xml +++ b/en_US.ISO8859-1/articles/committers-guide/article.xml @@ -509,15 +509,15 @@ You need a Passphrase to protect your secret key. repository. For the src tree, use: - &prompt.user; svn checkout svn+ssh://svn.freebsd.org/base/head /usr/src + &prompt.user; svn checkout svn+ssh://repo.freebsd.org/base/head /usr/src For the doc tree, use: - &prompt.user; svn checkout svn+ssh://svn.freebsd.org/doc/head /usr/doc + &prompt.user; svn checkout svn+ssh://repo.freebsd.org/doc/head /usr/doc For the ports tree, use: - &prompt.user; svn checkout svn+ssh://svn.freebsd.org/ports/head /usr/ports + &prompt.user; svn checkout svn+ssh://repo.freebsd.org/ports/head /usr/ports Though the remaining examples in this document are @@ -541,18 +541,18 @@ You need a Passphrase to protect your secret key. svn+ssh means the SVN protocol tunnelled over SSH. The name of the server is - svn.freebsd.org, base + repo.freebsd.org, base is the path to the repository, and head is the subdirectory within the repository. If your &os; login name is different from your login name on your local machine, you must either include it in the URL (for example - svn+ssh://jarjar@svn.freebsd.org/base/head), + svn+ssh://jarjar@repo.freebsd.org/base/head), or add an entry to your ~/.ssh/config in the form: - Host svn.freebsd.org + Host repo.freebsd.org User jarjar This is the simplest method, but it is hard to tell just @@ -572,7 +572,7 @@ You need a Passphrase to protect your secret key. Check out a working copy from a mirror by substituting the mirror's URL for - svn+ssh://svn.freebsd.org/base. This can + svn+ssh://repo.freebsd.org/base. This can be an official mirror or a mirror maintained by using svnsync. @@ -597,7 +597,7 @@ You need a Passphrase to protect your secret key. <literal>RELENG_*</literal> Branches and General Layout - In svn+ssh://svn.freebsd.org/base, + In svn+ssh://repo.freebsd.org/base, base refers to the source tree. Similarly, ports refers to the ports tree, and so on. These are separate repositories with their @@ -657,7 +657,7 @@ You need a Passphrase to protect your secret key. &os; Documentation Project Branches and Layout - In svn+ssh://svn.freebsd.org/doc, + In svn+ssh://repo.freebsd.org/doc, doc refers to the repository root of the source tree. @@ -697,7 +697,7 @@ You need a Passphrase to protect your secret key. &os; Ports Tree Branches and Layout - In svn+ssh://svn.freebsd.org/ports, + In svn+ssh://repo.freebsd.org/ports, ports refers to the repository root of the ports tree. @@ -756,7 +756,7 @@ You need a Passphrase to protect your secret key. As seen earlier, to check out the &os; head branch: - &prompt.user; svn checkout svn+ssh://svn.freebsd.org/base/head /usr/src + &prompt.user; svn checkout svn+ssh://repo.freebsd.org/base/head /usr/src At some point, more than just HEAD will probably be useful, for instance when merging changes @@ -767,7 +767,7 @@ You need a Passphrase to protect your secret key. To do this, first check out the root of the repository: - &prompt.user; svn checkout --depth=immediates svn+ssh://svn.freebsd.org/base + &prompt.user; svn checkout --depth=immediates svn+ssh://repo.freebsd.org/base This will give base with all the files it contains (at the time of writing, just @@ -1156,13 +1156,13 @@ You need a Passphrase to protect your secret key. Branching is very fast. The following command would be used to branch RELENG_8: - &prompt.user; svn copy svn+ssh://svn.freebsd.org/base/head svn+ssh://svn.freebsd.org/base/stable/8 + &prompt.user; svn copy svn+ssh://repo.freebsd.org/base/head svn+ssh://repo.freebsd.org/base/stable/8 This is equivalent to the following set of commands which take minutes and hours as opposed to seconds, depending on your network connection: - &prompt.user; svn checkout --depth=immediates svn+ssh://svn.freebsd.org/base + &prompt.user; svn checkout --depth=immediates svn+ssh://repo.freebsd.org/base &prompt.user; cd base &prompt.user; svn update --set-depth=infinity head &prompt.user; svn copy head stable/8 @@ -1178,7 +1178,7 @@ You need a Passphrase to protect your secret key. In all examples below, $FSVN refers to the location of the &os; Subversion repository, - svn+ssh://svn.freebsd.org/base/. + svn+ssh://repo.freebsd.org/base/. @@ -1467,7 +1467,7 @@ You need a Passphrase to protect your secret key. $FSVN is - svn+ssh://svn.freebsd.org/base + svn+ssh://repo.freebsd.org/base @@ -1520,7 +1520,7 @@ $target - head/$source:$P,$Q,$R Take a quick note of how it looks before moving on to the next step; doing the actual merge: - &prompt.user; svn merge -c r238987 svn+ssh://svn.freebsd.org/base/head/share/man/man4 stable/9/share/man/man4 + &prompt.user; svn merge -c r238987 svn+ssh://repo.freebsd.org/base/head/share/man/man4 stable/9/share/man/man4 --- Merging r238987 into 'stable/9/share/man/man4': U stable/9/share/man/man4/netmap.4 --- Recording mergeinfo for merge of r238987 into @@ -1703,7 +1703,7 @@ U stable/9/share/man/man4/netmap.4 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; svn merge --record-only svn+ssh://repo.freebsd.org/base/vendor/pf/dist@180876 . &prompt.user; svn commit @@ -1789,7 +1789,7 @@ 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://repo.freebsd.org/base/vendor/pf/dist svn+ssh://repo.freebsd.org/base/vendor/pf/4.3 Once that is complete, svn up the working copy of @@ -1812,7 +1812,7 @@ U stable/9/share/man/man4/netmap.4 &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://repo.freebsd.org/base/vendor/pf/dist . The --accept=postpone tells Subversion that it should not complain because merge @@ -1833,7 +1833,7 @@ U stable/9/share/man/man4/netmap.4 indicate the revision to merge from the /vendor tree. For example: - &prompt.user; svn checkout svn+ssh://svn.freebsd.org/base/head/contrib/sendmail + &prompt.user; svn checkout svn+ssh://repo.freebsd.org/base/head/contrib/sendmail &prompt.user; cd sendmail &prompt.user; svn merge -c r261190 ^/vendor/sendmail/dist . @@ -1856,7 +1856,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://repo.freebsd.org/base/vendor/pf/dist --new=. The --no-diff-deleted tells Subversion not to complain about files that are in the @@ -1947,7 +1947,7 @@ U stable/9/share/man/man4/netmap.4 This can also be done directly in the repository: - &prompt.user; svn merge -r179454:179453 svn+ssh://svn.freebsd.org/base/ROADMAP.txt + &prompt.user; svn merge -r179454:179453 svn+ssh://repo.freebsd.org/base/ROADMAP.txt It is important to ensure that the mergeinfo @@ -1961,12 +1961,12 @@ U stable/9/share/man/man4/netmap.4 is required. For example, to restore a file that was deleted in revision N, restore version N-1: - &prompt.user; svn copy svn+ssh://svn.freebsd.org/base/ROADMAP.txt@179454 + &prompt.user; svn copy svn+ssh://repo.freebsd.org/base/ROADMAP.txt@179454 &prompt.user; svn commit or, equally: - &prompt.user; svn copy svn+ssh://svn.freebsd.org/base/ROADMAP.txt@179454 svn+ssh://svn.freebsd.org/base + &prompt.user; svn copy svn+ssh://repo.freebsd.org/base/ROADMAP.txt@179454 svn+ssh://repo.freebsd.org/base Do not simply recreate the file manually and svn add it—this will @@ -2091,13 +2091,13 @@ U stable/9/share/man/man4/netmap.4 To create a project branch: - &prompt.user; svn copy svn+ssh://svn.freebsd.org/base/head svn+ssh://svn.freebsd.org/base/projects/spif + &prompt.user; svn copy svn+ssh://repo.freebsd.org/base/head svn+ssh://repo.freebsd.org/base/projects/spif To merge changes from HEAD back into the project branch: &prompt.user; cd copy_of_spif -&prompt.user; svn merge svn+ssh://svn.freebsd.org/base/head +&prompt.user; svn merge svn+ssh://repo.freebsd.org/base/head &prompt.user; svn commit It is important to resolve any merge conflicts before @@ -4135,7 +4135,7 @@ Relnotes: yes port: &prompt.user; cd /usr/ports/category -&prompt.user; svn cp 'svn+ssh://svn.freebsd.org/ports/head/category/portname/@XXXXXX' portname +&prompt.user; svn cp 'svn+ssh://repo.freebsd.org/ports/head/category/portname/@XXXXXX' portname Pick the revision that is just before the removal. For example, if the revision where it was @@ -4147,7 +4147,7 @@ Relnotes: yes after the last commit to 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; svn cp 'svn+ssh://repo.freebsd.org/ports/head/category/portname/@{YYYY-MM-DD}' portname @@ -4754,7 +4754,7 @@ Do you want to commit? (no = start a shell) [y/n] account, you need a few lines in your ~/.ssh/config: - Host svn.freebsd.org # Can be *.freebsd.org + Host repo.freebsd.org # Can be *.freebsd.org User freebsd-login