From owner-freebsd-doc@FreeBSD.ORG Sun Jan 22 18:01:53 2012 Return-Path: Delivered-To: freebsd-doc@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1C67C106566B for ; Sun, 22 Jan 2012 18:01:53 +0000 (UTC) (envelope-from bcr@FreeBSD.org) Received: from mxout1.bln1.prohost.de (mxout1.bln1.prohost.de [213.160.84.47]) by mx1.freebsd.org (Postfix) with ESMTP id 8E8A48FC12 for ; Sun, 22 Jan 2012 18:01:52 +0000 (UTC) Received: from Benedicts-Macbook-Pro.local (p4FC71B6C.dip.t-dialin.net [79.199.27.108]) (authenticated bits=0) by mx1.bln1.prohost.de (8.14.1/8.14.1) with ESMTP id q0MI1jlF022305 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Sun, 22 Jan 2012 19:01:46 +0100 Message-ID: <4F1C4F0D.8050007@FreeBSD.org> Date: Sun, 22 Jan 2012 19:01:49 +0100 From: Benedict Reuschling Organization: The FreeBSD Project User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:9.0) Gecko/20111222 Thunderbird/9.0.1 MIME-Version: 1.0 To: freebsd-doc@FreeBSD.org References: <4F1C3BF9.5050107@freebsd.org> In-Reply-To: <4F1C3BF9.5050107@freebsd.org> X-Enigmail-Version: 1.3.4 OpenPGP: id=4A819348 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit X-Null-Tag: d02e22acb95d69f3df3ff67c8ac31d46 Cc: Subject: Re: Handbook patch for mergemaster(8) without -p X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: bcr@FreeBSD.org List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Jan 2012 18:01:53 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 22.01.12 17:40, schrieb Rene Ladan: > 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 > > Is this OK to commit? > > Regards, > René Hi René, it looks OK to me. I would wait for dougb to confirm this, though. Thanks for picking this up from the DocIdeaList. Cheers Benedict Reuschling FreeBSD Documentation Committer The FreeBSD Documentation Project FreeBSD German Documentation Project - https://doc.bsdgroup.de -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.8 (Darwin) Comment: GPGTools - http://gpgtools.org Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk8cTw0ACgkQTSZQLkqBk0g0hACfRFcGOEqlHHT9EE+rBI43TEi+ bwgAnjJ5RRNU2eWMVoFTDFE8+Jjl510O =c7px -----END PGP SIGNATURE-----