From owner-svn-doc-all@freebsd.org Wed Mar 23 15:28:40 2016 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 19109ADAF14; Wed, 23 Mar 2016 15:28:40 +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 C8A941881; Wed, 23 Mar 2016 15:28:39 +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 u2NFSc0t099418; Wed, 23 Mar 2016 15:28:38 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2NFScvb099417; Wed, 23 Mar 2016 15:28:38 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201603231528.u2NFScvb099417@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Wed, 23 Mar 2016 15:28:38 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r48460 - 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.21 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: Wed, 23 Mar 2016 15:28:40 -0000 Author: mat Date: Wed Mar 23 15:28:38 2016 New Revision: 48460 URL: https://svnweb.freebsd.org/changeset/doc/48460 Log: Add a small bit about the mfh script being able to handle multiple revisions at once. Reviewed by: wblock Sponsored by: Absolight Differential Revision: https://reviews.freebsd.org/D5634 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 Wed Mar 23 13:28:41 2016 (r48459) +++ head/en_US.ISO8859-1/articles/committers-guide/article.xml Wed Mar 23 15:28:38 2016 (r48460) @@ -4803,6 +4803,21 @@ Do you want to commit? (no = start a she Host repo.freebsd.org # Can be *.freebsd.org User freebsd-login + + + The script is also able to merge more than one + revision at a time. If there have been other updates + to the port since the branch was created that have not + been merged because they were not security related. + Add the different revisions in the order they were + committed on the mfh command line. + The new commit log message will contain the combined + log messages from all the original commits. These + 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 +