From owner-svn-src-stable@freebsd.org Wed Jun 27 23:01:04 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4DCFA1019D66; Wed, 27 Jun 2018 23:01:04 +0000 (UTC) (envelope-from devin@shxd.cx) Received: from shxd.cx (mail.shxd.cx [64.201.244.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DCBB8776E7; Wed, 27 Jun 2018 23:01:03 +0000 (UTC) (envelope-from devin@shxd.cx) Received: from [74.217.198.10] (port=1314 helo=[10.1.4.66]) by shxd.cx with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.77 (FreeBSD)) (envelope-from ) id 1fYA6X-0006er-6t; Wed, 27 Jun 2018 13:03:25 +0000 From: Devin Teske Message-Id: Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\)) Subject: Re: svn commit: r335744 - stable/10/sys/boot/forth Date: Wed, 27 Jun 2018 16:00:55 -0700 In-Reply-To: Cc: Devin Teske , src-committers , svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org To: Kyle Evans References: <201806272122.w5RLM0n4011171@repo.freebsd.org> X-Mailer: Apple Mail (2.3273) Sender: devin@shxd.cx Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.26 X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jun 2018 23:01:04 -0000 > On Jun 27, 2018, at 2:58 PM, Kyle Evans wrote: >=20 > On Wed, Jun 27, 2018 at 4:57 PM, Devin Teske > wrote: >>=20 >> On Jun 27, 2018, at 2:24 PM, Kyle Evans wrote: >>=20 >> On Wed, Jun 27, 2018 at 4:22 PM, Devin Teske = wrote: >>=20 >> Author: dteske >> Date: Wed Jun 27 21:22:00 2018 >> New Revision: 335744 >> URL: https://svnweb.freebsd.org/changeset/base/335744 >>=20 >> Log: >> MFC r335607: check-password.4th(8): Fix manual [in]accuracy >>=20 >> SVN r280384 updated the maximum password length from 16 bytes to 255. = The >> manual was not updated to reflect this. >>=20 >> Sponsored by: Smule, Inc. >>=20 >> Modified: >> stable/10/sys/boot/forth/check-password.4th.8 >>=20 >>=20 >> Hi, >>=20 >> 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. >>=20 >>=20 >> I kept trying that and kept getting "tree conflict" because it wants = to >> record info in stand which doesn't exist. >>=20 >> Do you have a recommended way to achieve this that has a half-way = chance of >> working? >> -- >=20 > Target the base directory should be fine; assuming you're at base/: >=20 > svn merge -c r335607 --record-only ^/head stable/11 stable/11 ??? --=20 Devin