Date: Sun, 22 Jan 2012 19:01:49 +0100 From: Benedict Reuschling <bcr@FreeBSD.org> To: freebsd-doc@FreeBSD.org Subject: Re: Handbook patch for mergemaster(8) without -p Message-ID: <4F1C4F0D.8050007@FreeBSD.org> In-Reply-To: <4F1C3BF9.5050107@freebsd.org> References: <4F1C3BF9.5050107@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
-----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-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4F1C4F0D.8050007>