Date: Wed, 27 Jun 2018 16:00:55 -0700 From: Devin Teske <dteske@FreeBSD.org> To: Kyle Evans <kevans@FreeBSD.org> Cc: Devin Teske <dteske@FreeBSD.org>, src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: Re: svn commit: r335744 - stable/10/sys/boot/forth Message-ID: <B9874754-2FAE-48AB-8A47-1ABE60A58034@FreeBSD.org> In-Reply-To: <CACNAnaELJe6-QA0LDq%2BcBFfVtuw3scJKdtD26j7UkrC_AnLz4g@mail.gmail.com> References: <201806272122.w5RLM0n4011171@repo.freebsd.org> <CACNAnaHFQb9Jg=LfosjAM6Ud9UtA3UQesuh_GoSKHCjTnmWdzQ@mail.gmail.com> <B06541C3-CCC9-4677-B229-D0A7A5453530@FreeBSD.org> <CACNAnaELJe6-QA0LDq%2BcBFfVtuw3scJKdtD26j7UkrC_AnLz4g@mail.gmail.com>
index | next in thread | previous in thread | raw e-mail
> On Jun 27, 2018, at 2:58 PM, Kyle Evans <kevans@FreeBSD.org> wrote: > > On Wed, Jun 27, 2018 at 4:57 PM, Devin Teske <dteske@freebsd.org <mailto:dteske@freebsd.org>> wrote: >> >> On Jun 27, 2018, at 2:24 PM, Kyle Evans <kevans@FreeBSD.org> wrote: >> >> On Wed, Jun 27, 2018 at 4:22 PM, Devin Teske <dteske@freebsd.org> wrote: >> >> Author: dteske >> Date: Wed Jun 27 21:22:00 2018 >> New Revision: 335744 >> URL: https://svnweb.freebsd.org/changeset/base/335744 >> >> Log: >> MFC r335607: check-password.4th(8): Fix manual [in]accuracy >> >> SVN r280384 updated the maximum password length from 16 bytes to 255. The >> manual was not updated to reflect this. >> >> Sponsored by: Smule, Inc. >> >> Modified: >> stable/10/sys/boot/forth/check-password.4th.8 >> >> >> Hi, >> >> I think this should probably have been supplemented with a record-only >> merge of r335607 since it has actually been MFC'd, just in the old >> location. I'm not sure how much it matters, though, other than >> reflecting that this (general this; stable/10 commits) really wasn't a >> direct commit. >> >> >> I kept trying that and kept getting "tree conflict" because it wants to >> record info in stand which doesn't exist. >> >> Do you have a recommended way to achieve this that has a half-way chance of >> working? >> -- > > Target the base directory should be fine; assuming you're at base/: > > svn merge -c r335607 --record-only ^/head stable/11 stable/11 ??? -- Devinhelp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?B9874754-2FAE-48AB-8A47-1ABE60A58034>