From owner-freebsd-hackers@freebsd.org  Wed Jun  1 22:32:45 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 86204B668F7
 for <freebsd-hackers@mailman.ysv.freebsd.org>;
 Wed,  1 Jun 2016 22:32:45 +0000 (UTC)
 (envelope-from yaneurabeya@gmail.com)
Received: from mail-qg0-x234.google.com (mail-qg0-x234.google.com
 [IPv6:2607:f8b0:400d:c04::234])
 (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 552FA1CB7;
 Wed,  1 Jun 2016 22:32:45 +0000 (UTC)
 (envelope-from yaneurabeya@gmail.com)
Received: by mail-qg0-x234.google.com with SMTP id p34so45618363qgp.1;
 Wed, 01 Jun 2016 15:32:45 -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=O1iTkilxZqYh3lV1r6G940E9QGr/mj1DQ6MCx0YdCps=;
 b=raw+mrGupSN/Rlqv67I0AsKvxotE2ez5Zsb1akugAYKMDWNs1tRUIcsc1lFvQBUuYj
 vKd66o1tlPd5MjrcFiHCiK09761Ke8J9pSF4wD/tO6Pg9+gOtapdipZ1cDLxmo/TlxZH
 okZROCdAOfADLdgctAyJusGBoJX+GqISjGiDOH8oqgbnEgxSHCtWhD5epkcbT/R3kkZ6
 2666vQA7bz1KLmd0RDvVJEZWuq0s02fC1VVfrDf8XO9PnIDz+HCP47sxmlZluxKgMU5E
 9kBIEPoZbKDwvKDa+6hjciS3nsqbptP7R+KfCgD37q3mHl8xh9S6SuvcU9oCmHqoMs08
 hi2g==
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=O1iTkilxZqYh3lV1r6G940E9QGr/mj1DQ6MCx0YdCps=;
 b=aHXebFZbWZ01If7eyONPCTes8UZcRy4a0ddAIqM5bYwkbioa7+BYbMS/87K2rjDOEU
 TGBMFFktQaANfaRORaj7amNZPdIpDvLVx9QLcFeTnRrIO6GbJNNiNkKdCJNjAVexQFkm
 EeomJw6KWdNl3FcFv1d+kbJs3/QNbymmN+Iv6o7T0Y1Bs0tFZDyuVQrWGNCEvl5+hTxS
 5TMX9bGNgHaL6pLAeB6FY9Z7ewu+oVlaBS+JHHRdpqmWLRk0pfwFZJaM2tLmMFl5FOKo
 LhzM0KwvdorHlmhDWdyiHwM1prKoKoPY8L2A5pPRAUTo/lt0DGR9an7zC241DAkYnm9R
 UrOQ==
X-Gm-Message-State: ALyK8tIF8/TqRQJ7RQ/me8PFfnPWhthznkoqlTmYwQHk69a9Ulgn9sHyXgxaHH0dmy9UrGoJWjfggrvUfyGIIA==
MIME-Version: 1.0
X-Received: by 10.140.34.199 with SMTP id l65mr32185735qgl.62.1464820364446;
 Wed, 01 Jun 2016 15:32:44 -0700 (PDT)
Received: by 10.55.146.69 with HTTP; Wed, 1 Jun 2016 15:32:44 -0700 (PDT)
In-Reply-To: <201606012212.u51MC2UR036796@gw.catspoiler.org>
References: <CAGHfRMBO2GP-ZY1ZS57K=m+P2MMZOyitjykfcLYfhH1gu-Zb+Q@mail.gmail.com>
 <201606012212.u51MC2UR036796@gw.catspoiler.org>
Date: Wed, 1 Jun 2016 15:32:44 -0700
Message-ID: <CAGHfRMBAaErJwHfW4FE3xqw1d1t+hpZ3sHPMFOEw0JwfU--CPA@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 22:32:45 -0000

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...