From owner-svn-src-stable@freebsd.org Wed Jun 27 21:59:22 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 AE5C1101519D; Wed, 27 Jun 2018 21:59:22 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5C2D07582C; Wed, 27 Jun 2018 21:59:22 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-lf0-f45.google.com (mail-lf0-f45.google.com [209.85.215.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id ECD8D20BA8; Wed, 27 Jun 2018 21:59:21 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-lf0-f45.google.com with SMTP id m12-v6so2093924lfc.10; Wed, 27 Jun 2018 14:59:21 -0700 (PDT) X-Gm-Message-State: APt69E2svHH4Eb2KAEwXUTI8vOEwfLeGrrNbTxv1NhL7TUPhaAwUE8Sl U5uR41xcabmKNp9Cdlw/XASUeTnAUr3NTdU6COg= X-Google-Smtp-Source: AAOMgpfq/CsIhERajPJXzkmJEaRG69UG7GWZtqmIRCCxlhSVcknpzn8TGOqXMi7KW7P11CEHP06D4k25Glag932oQt4= X-Received: by 2002:a19:b598:: with SMTP id g24-v6mr5475331lfk.129.1530136760458; Wed, 27 Jun 2018 14:59:20 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a2e:3c0f:0:0:0:0:0 with HTTP; Wed, 27 Jun 2018 14:58:59 -0700 (PDT) In-Reply-To: References: <201806272122.w5RLM0n4011171@repo.freebsd.org> From: Kyle Evans Date: Wed, 27 Jun 2018 16:58:59 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r335744 - stable/10/sys/boot/forth To: Devin Teske Cc: Kyle Evans , src-committers , svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Content-Type: text/plain; charset="UTF-8" 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 21:59:22 -0000 On Wed, Jun 27, 2018 at 4:57 PM, Devin Teske wrote: > > On Jun 27, 2018, at 2:24 PM, Kyle Evans wrote: > > On Wed, Jun 27, 2018 at 4:22 PM, Devin Teske 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