svn commit: r335744 - stable/10/sys/boot/forth

[Kyle Evans]

On Wed, Jun 27, 2018 at 6:00 PM, Devin Teske <dteske at freebsd.org> wrote:
>
> On Jun 27, 2018, at 2:58 PM, Kyle Evans <kevans at FreeBSD.org> wrote:
>
> On Wed, Jun 27, 2018 at 4:57 PM, Devin Teske <dteske at freebsd.org> wrote:
>
>
> On Jun 27, 2018, at 2:24 PM, Kyle Evans <kevans at FreeBSD.org> wrote:
>
> On Wed, Jun 27, 2018 at 4:22 PM, Devin Teske <dteske at 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 ???
> --
> Devin
>

s/11/10/

Works just the same. =)