From owner-freebsd-hackers@freebsd.org  Wed Jun 15 06:25:40 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 7605BB72180
 for <freebsd-hackers@mailman.ysv.freebsd.org>;
 Wed, 15 Jun 2016 06:25:40 +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 5858C2247
 for <freebsd-hackers@freebsd.org>; Wed, 15 Jun 2016 06:25:40 +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 u5F6PL60031780;
 Tue, 14 Jun 2016 23:25:25 -0700 (PDT)
 (envelope-from truckman@FreeBSD.org)
Message-Id: <201606150625.u5F6PL60031780@gw.catspoiler.org>
Date: Tue, 14 Jun 2016 23:25:21 -0700 (PDT)
From: Don Lewis <truckman@FreeBSD.org>
Subject: Re: how to MFC when the target moved?
To: danielsh@apache.org
cc: yaneurabeya@gmail.com, freebsd-hackers@freebsd.org
In-Reply-To: <20160602110100.GA2451@tarsus.local2>
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, 15 Jun 2016 06:25:40 -0000

On  2 Jun, Daniel Shahaf wrote:
> Ngie Cooper wrote on Wed, Jun 01, 2016 at 13:59:43 -0700:
>> 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!
>> -Ngie
>> 
>> cd /usr/src
>> svn merge -c <revision> --record-only ^/head
>> patch file manually
>> svn commit $PWD
> 
> That would work, but for future reference, you could do it in one
> command:
> 
>     svn merge -c r300705 ^/head/usr.bin/fortune /usr/src/games/fortune

That doesn't quite work, either.  The mergeinfo gets added to
/usr/src/games/fortune instead of /usr/src.