From owner-svn-doc-all@freebsd.org Tue Jan 3 18:39:03 2017 Return-Path: Delivered-To: svn-doc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 506E9C9D37B; Tue, 3 Jan 2017 18:39:03 +0000 (UTC) (envelope-from mat@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 mx1.freebsd.org (Postfix) with ESMTPS id 1FC3016A7; Tue, 3 Jan 2017 18:39:03 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v03Id2V6034425; Tue, 3 Jan 2017 18:39:02 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v03Id29F034424; Tue, 3 Jan 2017 18:39:02 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201701031839.v03Id29F034424@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Tue, 3 Jan 2017 18:39:02 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r49792 - 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.23 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: Tue, 03 Jan 2017 18:39:03 -0000 Author: mat Date: Tue Jan 3 18:39:02 2017 New Revision: 49792 URL: https://svnweb.freebsd.org/changeset/doc/49792 Log: Note the branch name as the first argument of mfh is obsolete. Sponsored by: Absolight 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 Tue Jan 3 16:43:38 2017 (r49791) +++ head/en_US.ISO8859-1/articles/committers-guide/article.xml Tue Jan 3 18:39:02 2017 (r49792) @@ -4739,7 +4739,7 @@ Relnotes: yes commit: ports/Tools/scripts/mfh. It is used as follows: - &prompt.user; /usr/ports/Tools/scripts/mfh 2015Q1 380362 + &prompt.user; /usr/ports/Tools/scripts/mfh 380362 U 2015Q1 Checked out revision 380443. A 2015Q1/security @@ -4825,8 +4825,17 @@ Do you want to commit? (no = start a she messages must be edited to show what is actually being done with the new commit. - &prompt.user; /usr/ports/Tools/scripts/mfh 2016Q1 r407208 r407713 r407722 r408567 r408943 r410728 + &prompt.user; /usr/ports/Tools/scripts/mfh r407208 r407713 r407722 r408567 r408943 r410728 + + + The mfh script can also take an optional first + argument, the branch where the merge is being done. + It does, however, select the latest branch, so + specifying the branch is discourraged. + + &prompt.user; /usr/ports/Tools/scripts/mfh 2016Q1 r407208 r407713 +