From owner-svn-doc-all@freebsd.org Sat Jun 16 20:10:42 2018 Return-Path: Delivered-To: svn-doc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 09524102145D; Sat, 16 Jun 2018 20:10:42 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B26256DEB5; Sat, 16 Jun 2018 20:10:41 +0000 (UTC) (envelope-from eadler@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 938453105; Sat, 16 Jun 2018 20:10:41 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5GKAfim068325; Sat, 16 Jun 2018 20:10:41 GMT (envelope-from eadler@FreeBSD.org) Received: (from eadler@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5GKAf52068324; Sat, 16 Jun 2018 20:10:41 GMT (envelope-from eadler@FreeBSD.org) Message-Id: <201806162010.w5GKAf52068324@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eadler set sender to eadler@FreeBSD.org using -f From: Eitan Adler Date: Sat, 16 Jun 2018 20:10:41 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r51849 - head/en_US.ISO8859-1/articles/committers-guide X-SVN-Group: doc-head X-SVN-Commit-Author: eadler X-SVN-Commit-Paths: head/en_US.ISO8859-1/articles/committers-guide X-SVN-Commit-Revision: 51849 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.26 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: Sat, 16 Jun 2018 20:10:42 -0000 Author: eadler Date: Sat Jun 16 20:10:41 2018 New Revision: 51849 URL: https://svnweb.freebsd.org/changeset/doc/51849 Log: Committer guide: further remove merge information older branches There are no such supported branches. Those that need to merge to such branches can get the information from the documentation archive. While here, remove an incorrect note that depth cannnot be reduced (it can be). 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 Jun 16 17:07:21 2018 (r51848) +++ head/en_US.ISO8859-1/articles/committers-guide/article.xml Sat Jun 16 20:10:41 2018 (r51849) @@ -35,6 +35,7 @@ 2015 2016 2017 + 2018 The &os; Documentation Project @@ -818,11 +819,6 @@ You need a Passphrase to protect your secret key.head and stable/7; it will not pull down the whole tree. - - - Decreasing the depth of a working copy is not - possible. - @@ -1266,13 +1262,6 @@ You need a Passphrase to protect your secret key.&prompt.user; svn merge -c r123456 ^/head/ stable/11 &prompt.user; svn commit stable/11 - - Note the sections below which outline changes to - the target location of the stable/ - branch starting with - stable/10. - - Merges to releng/ branches should always originate from the corresponding stable/ branch. For example: @@ -1288,14 +1277,8 @@ You need a Passphrase to protect your secret key.releng/ branch for a Security Advisory or Errata Notice. - - - Selecting the Source and Target for - <literal>stable/10</literal> and Newer - - Starting with the stable/10 - branch, all merges are + All merges are merged to and committed from the root of the branch. All merges look like: @@ -1306,10 +1289,6 @@ You need a Passphrase to protect your secret key. - Merges to releng/ branches must - always originate from the corresponding - stable/ branch. For example: - &prompt.user; svn merge -c r123456 ^/stable/10 releng/10.0 @@ -1435,27 +1414,6 @@ U stable/9/share/man/man4/netmap.4 only thing left is the actual commit. &prompt.user; svn commit stable/9/share/man/man4 - - - - Merging into the Kernel - (<filename>sys/</filename>) - - As stated above, merging into the kernel is - different from merging in the rest of the tree. In many - ways merging to the kernel is simpler because there is - always the same merge target - (sys/). - - Once svn merge has been executed, - svn diff has to be run on the - directory to check the changes. This may show some - unrelated property changes, but these can be ignored. - Next, build and test the kernel, and, once the tests are - complete, commit the code as normal, making sure that - the commit message starts with Merge - r226222 from head, - or similar.