From owner-freebsd-hackers@freebsd.org  Thu Jun  2 11:04:17 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 9DB2FB62E8D
 for <freebsd-hackers@mailman.ysv.freebsd.org>;
 Thu,  2 Jun 2016 11:04:17 +0000 (UTC)
 (envelope-from danielsh@apache.org)
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
 by mx1.freebsd.org (Postfix) with SMTP id 6273311B1
 for <freebsd-hackers@freebsd.org>; Thu,  2 Jun 2016 11:04:16 +0000 (UTC)
 (envelope-from danielsh@apache.org)
Received: (qmail 82319 invoked by uid 99); 2 Jun 2016 11:04:16 -0000
Received: from mail-relay.apache.org (HELO mail-relay.apache.org)
 (140.211.11.15)
 by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Jun 2016 11:04:16 +0000
Received: by mail-relay.apache.org (ASF Mail Server at mail-relay.apache.org,
 from userid 3316)
 id B20441A0044; Thu,  2 Jun 2016 11:04:15 +0000 (UTC)
Date: Thu, 2 Jun 2016 11:04:02 +0000
From: Daniel Shahaf <danielsh@apache.org>
To: Ngie Cooper <yaneurabeya@gmail.com>
Cc: Don Lewis <truckman@freebsd.org>, freebsd-hackers@freebsd.org
Subject: Re: how to MFC when the target moved?
Message-ID: <20160602110100.GA2451@tarsus.local2>
References: <201606011804.u51I4NrN036166@gw.catspoiler.org>
 <CAGHfRMBO2GP-ZY1ZS57K=m+P2MMZOyitjykfcLYfhH1gu-Zb+Q@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <CAGHfRMBO2GP-ZY1ZS57K=m+P2MMZOyitjykfcLYfhH1gu-Zb+Q@mail.gmail.com>
User-Agent: Mutt/1.5.21 (2010-09-15)
X-Mailman-Approved-At: Thu, 02 Jun 2016 18:07:57 +0000
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: Thu, 02 Jun 2016 11:04:17 -0000

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

Also, you don't need to pass «$PWD»; if you leave it out it's implied
(with all subcommands except 'revert').

Cheers,

Daniel