Date: Mon, 29 Oct 2012 00:46:47 -0400 From: Eitan Adler <eadler@freebsd.org> To: Konstantin Belousov <kostikbel@gmail.com> Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-9@freebsd.org Subject: Re: svn commit: r242283 - stable/9/sys/kern Message-ID: <CAF6rxg=SxEkvQMf0pHmQb8x5V2P4fm0wWnhPis16yeEBno5u_w@mail.gmail.com> In-Reply-To: <20121029043242.GH73505@kib.kiev.ua> References: <201210290352.q9T3qJa3070064@svn.freebsd.org> <20121029043242.GH73505@kib.kiev.ua>
next in thread | previous in thread | raw e-mail | index | archive | help
On 29 October 2012 00:32, Konstantin Belousov <kostikbel@gmail.com> wrote: > On Mon, Oct 29, 2012 at 03:52:19AM +0000, Eitan Adler wrote: >> Author: eadler >> Date: Mon Oct 29 03:52:18 2012 >> New Revision: 242283 >> URL: http://svn.freebsd.org/changeset/base/242283 >> >> Log: >> MFC r241855,r241859: >> Update the kill(2) and killpg(2) man pages to the modern permission >> checks. Also indicate killpg(2) is POSIX compliant. >> >> Correct the killpg(2) return values: >> >> Return EPERM if processes were found but they >> were unable to be signaled. >> >> Return the first error from p_cansignal if no signal was successful. >> >> Discussed with: jilles >> Approved by: cperciva (implicit) >> >> Modified: >> stable/9/sys/kern/kern_sig.c >> Directory Properties: >> stable/9/sys/ (props changed) > According to svn mail, r241855 was not merged. Okay, this is weird. I am certain my original merge command included both revisions. Looking at the email it is clear that the documentation was not MFCed. If I attempt to MFC again now I see no changes. %svn merge -c241855 svn+ssh://svn.freebsd.org/base//head/sys stable9/sys %svn status stable9 %svn diff stable9 % What did I do wrong? -- Eitan Adler Source, Ports, Doc committer Bugmeister, Ports Security teams
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAF6rxg=SxEkvQMf0pHmQb8x5V2P4fm0wWnhPis16yeEBno5u_w>