From owner-freebsd-hackers@freebsd.org  Wed Jun  1 20:59:44 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 CAEA6B646A0
 for <freebsd-hackers@mailman.ysv.freebsd.org>;
 Wed,  1 Jun 2016 20:59:44 +0000 (UTC)
 (envelope-from yaneurabeya@gmail.com)
Received: from mail-qg0-x22f.google.com (mail-qg0-x22f.google.com
 [IPv6:2607:f8b0:400d:c04::22f])
 (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))
 by mx1.freebsd.org (Postfix) with ESMTPS id 898D01121;
 Wed,  1 Jun 2016 20:59:44 +0000 (UTC)
 (envelope-from yaneurabeya@gmail.com)
Received: by mail-qg0-x22f.google.com with SMTP id q32so114564440qgq.3;
 Wed, 01 Jun 2016 13:59:44 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:in-reply-to:references:date:message-id:subject:from:to
 :cc; bh=YeY2cjrtceGSigyIRrbo8lmmINj0c353WbsuaVjBFxI=;
 b=uD1faoJEHiwXHQp2u/q8/clWzY56rxQuuXQDl2/DK0s19A3bzJmbryxIJkjKsoC6HM
 +0hZGeirEwFBYMUKkeUjuUKmDFxJ6c1if9DAu750czszZu3jSc8DKu6TAuR7rn6rZG5U
 e3mddMRNNKdNeGMC3FNWd1e3THO1Um1TwwGMH7PqWDk4sA0wMsDwPAqa8U+H8+iSHmwV
 576MdL1uJU6E8ekwZR9EqJ6ROgEUXjkxure4SnDW11AYIccsrnYp7UGHRPjE1KCSOrWG
 d1eWIDq2BfOU/Xoh69Hz3MQdGcEOavuatAQs5yEqLmvuxh1WtEP3IfQYrBgitIfID9Du
 zR7w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20130820;
 h=x-gm-message-state:mime-version:in-reply-to:references:date
 :message-id:subject:from:to:cc;
 bh=YeY2cjrtceGSigyIRrbo8lmmINj0c353WbsuaVjBFxI=;
 b=UarZbax6t53CY4N57+WcxcNrQLPBnnCpUTJS0HtkEYF8h225/YSALIiZ4+edJLwvJg
 LxDoJ1EkhlqxUq3yu4NflfPU0v81mcVCj4WwLsgJa5KPqLiJFot83vbq7IVLHeFeWWmM
 bq5A+5fyPjTgpKcV0hTLzcgKq6xa7LeFBdmv/Xb9J6YqIQyznEdvPPD5PPjbvFPeV6H9
 xkTaXpIH1J0cBpzgeL+A0BKdCVT0D6rdVKg9bLrXPEgomzMWnPivJ0+vJJSyxQB8TGZU
 eEXaouNzx/lFegtqTJ4+ZETBGVAMYixXJxxsmA4eDyrVg2haVURfBgubnqINON9BaV+U
 /yQA==
X-Gm-Message-State: ALyK8tKUwlG90HYfkbjQyJ3yM9jNZsMPTw/EupvMcTquydGpcmOjNPymfipmzTGTWuAj+111kVTsY4D8twV0cg==
MIME-Version: 1.0
X-Received: by 10.140.156.195 with SMTP id c186mr40716979qhc.58.1464814783500; 
 Wed, 01 Jun 2016 13:59:43 -0700 (PDT)
Received: by 10.55.146.69 with HTTP; Wed, 1 Jun 2016 13:59:43 -0700 (PDT)
In-Reply-To: <201606011804.u51I4NrN036166@gw.catspoiler.org>
References: <201606011804.u51I4NrN036166@gw.catspoiler.org>
Date: Wed, 1 Jun 2016 13:59:43 -0700
Message-ID: <CAGHfRMBO2GP-ZY1ZS57K=m+P2MMZOyitjykfcLYfhH1gu-Zb+Q@mail.gmail.com>
Subject: Re: how to MFC when the target moved?
From: Ngie Cooper <yaneurabeya@gmail.com>
To: Don Lewis <truckman@freebsd.org>
Cc: "freebsd-hackers@freebsd.org" <freebsd-hackers@freebsd.org>
Content-Type: text/plain; charset=UTF-8
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 20:59:44 -0000

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