From owner-freebsd-hackers@freebsd.org  Wed Jun  1 22:42:06 2016
Return-Path: <owner-freebsd-hackers@freebsd.org>
Delivered-To: freebsd-hackers@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 08B70B66C34
 for <freebsd-hackers@mailman.ysv.freebsd.org>;
 Wed,  1 Jun 2016 22:42:06 +0000 (UTC)
 (envelope-from truckman@FreeBSD.org)
Received: from gw.catspoiler.org (unknown [IPv6:2602:304:b010:ef20::f2])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "gw.catspoiler.org", Issuer "gw.catspoiler.org" (not verified))
 by mx1.freebsd.org (Postfix) with ESMTPS id DE9631161
 for <freebsd-hackers@freebsd.org>; Wed,  1 Jun 2016 22:42:05 +0000 (UTC)
 (envelope-from truckman@FreeBSD.org)
Received: from FreeBSD.org (mousie.catspoiler.org [192.168.101.2])
 by gw.catspoiler.org (8.15.2/8.15.2) with ESMTP id u51Mfvdw036856;
 Wed, 1 Jun 2016 15:42:01 -0700 (PDT)
 (envelope-from truckman@FreeBSD.org)
Message-Id: <201606012242.u51Mfvdw036856@gw.catspoiler.org>
Date: Wed, 1 Jun 2016 15:41:57 -0700 (PDT)
From: Don Lewis <truckman@FreeBSD.org>
Subject: Re: how to MFC when the target moved?
To: yaneurabeya@gmail.com
cc: freebsd-hackers@freebsd.org
In-Reply-To: <CAGHfRMBAaErJwHfW4FE3xqw1d1t+hpZ3sHPMFOEw0JwfU--CPA@mail.gmail.com>
MIME-Version: 1.0
Content-Type: TEXT/plain; charset=us-ascii
X-BeenThere: freebsd-hackers@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: Technical Discussions relating to FreeBSD
 <freebsd-hackers.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/freebsd-hackers>, 
 <mailto:freebsd-hackers-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-hackers/>
List-Post: <mailto:freebsd-hackers@freebsd.org>
List-Help: <mailto:freebsd-hackers-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/freebsd-hackers>, 
 <mailto:freebsd-hackers-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Jun 2016 22:42:06 -0000

On  1 Jun, Ngie Cooper wrote:
> On Wed, Jun 1, 2016 at 3:12 PM, Don Lewis <truckman@freebsd.org> wrote:
>> On  1 Jun, Ngie Cooper wrote:
>>> On Wed, Jun 1, 2016 at 11:04 AM, Don Lewis <truckman@freebsd.org>
>>> wrote:
>>>> I'd like to MFC r300705, which updates
>>>> usr.bin/fortune/unstr/unstr.c, but fortune moved from /usr/games to
>>>> /usr/bin between FreeBSD 10 and 11. What is the best way to
>>>> proceed?  Manually apply the patch and direct commit?
>>>
>>> Something like this is what you want to do when recording the merge..
>>> Cheers!
>>
>> Hmn ... it wants to record merginfo into sys/gnu/dts when I do that ...
>>
>> mousie:src 382%svn merge -c 300705 --record-only '^/head/' .
>> --- Recording mergeinfo for merge of r300705 into '.':
>>  U   .
>> --- Recording mergeinfo for merge of r300705 into 'sys/gnu/dts':
>>  U   sys/gnu/dts
>>
>>
>> It doesn't to that if I omit --record-only.
> 
> Eh... revert those items. Not sure why it's trying to merge in that
> mergeinfo...

Yeah, I managed to figure out the revert workaround on my own.  It seems
to be a svn bug with --record-only.  I merged a whole bunch of other
stuff earlier and didn't run into this.