Date: Mon, 23 Jan 2012 08:23:08 +0100 From: Rene Ladan <rene@freebsd.org> To: Doug Barton <dougb@FreeBSD.org> Cc: Rene Ladan <rene@freebsd.org>, "doc@FreeBSD.org" <doc@FreeBSD.org> Subject: Re: Handbook patch for mergemaster(8) without -p Message-ID: <4F1D0ADC.30904@freebsd.org> In-Reply-To: <4F1C9B37.3050506@FreeBSD.org> References: <4F1C3BF9.5050107@freebsd.org> <4F1C9B37.3050506@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 23-01-2012 00:26, Doug Barton wrote: > 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. > http://p4web.freebsd.org/@md=d&cd=//&cdf=//depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml&c=noF@//depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/cutting-edge/chapter.sgml?ac=19&rev1=29&rev2=30 >> Is this OK to commit? > > It's safe to remove the instructions for no -p option, yes. > OK, committed. René -- http://www.rene-ladan.nl:8080/ GPG fingerprint = ADBC ECCD EB5F A6B4 549F 600D 8C9E 647A E564 2BFC (subkeys.pgp.net)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4F1D0ADC.30904>