From owner-freebsd-doc@FreeBSD.ORG Sun Jan 22 23:26:48 2012 Return-Path: Delivered-To: doc@FreeBSD.org Received: from mx2.freebsd.org (mx2.freebsd.org [IPv6:2001:4f8:fff6::35]) by hub.freebsd.org (Postfix) with ESMTP id A2D9B1065673; Sun, 22 Jan 2012 23:26:48 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from 172-17-198-245.globalsuite.net (hub.freebsd.org [IPv6:2001:4f8:fff6::36]) by mx2.freebsd.org (Postfix) with ESMTP id EB1B415020A; Sun, 22 Jan 2012 23:26:47 +0000 (UTC) Message-ID: <4F1C9B37.3050506@FreeBSD.org> Date: Sun, 22 Jan 2012 15:26:47 -0800 From: Doug Barton Organization: http://SupersetSolutions.com/ User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:9.0) Gecko/20120119 Thunderbird/9.0 MIME-Version: 1.0 To: Rene Ladan References: <4F1C3BF9.5050107@freebsd.org> In-Reply-To: <4F1C3BF9.5050107@freebsd.org> X-Enigmail-Version: 1.3.5 OpenPGP: id=1A1ABC84 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: "doc@FreeBSD.org" Subject: Re: Handbook patch for mergemaster(8) without -p X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Jan 2012 23:26:48 -0000 On 01/22/2012 08:40, Rene Ladan wrote: > Hi, > > the DocIdeaList on the wiki (http://wiki.freebsd.org/DocIdeaList) > contains an item about removing instructions on what to do when > mergemaster(8) does not contain the -p option. According to svnweb, it > has supported this option since at least 2000, so all supported releases > (7.3, 7.4, 8.1, 8.2, 9.0) should have it. > > The patch is available at > http://p4web.freebsd.org/@@205007?ac=10 When I click that link all I see is the log. > Is this OK to commit? It's safe to remove the instructions for no -p option, yes. -- It's always a long day; 86400 doesn't fit into a short. Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/