From owner-freebsd-hackers@freebsd.org Fri Jun 3 09:01:43 2016 Return-Path: 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 7A8A0B680C6 for ; Fri, 3 Jun 2016 09:01:43 +0000 (UTC) (envelope-from ian@freebsd.org) Received: from outbound1a.eu.mailhop.org (outbound1a.eu.mailhop.org [52.58.109.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E1DDC1D35 for ; Fri, 3 Jun 2016 09:01:42 +0000 (UTC) (envelope-from ian@freebsd.org) X-MHO-User: cababb5e-2969-11e6-ac92-3142cfe117f2 X-Report-Abuse-To: https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information X-Originating-IP: 73.34.117.227 X-Mail-Handler: DuoCircle Outbound SMTP Received: from ilsoft.org (unknown [73.34.117.227]) by outbound1.eu.mailhop.org (Halon Mail Gateway) with ESMTPSA; Fri, 3 Jun 2016 09:01:42 +0000 (UTC) Received: from rev (rev [172.22.42.240]) by ilsoft.org (8.15.2/8.14.9) with ESMTP id u52G5WVJ010637; Thu, 2 Jun 2016 10:05:32 -0600 (MDT) (envelope-from ian@freebsd.org) Message-ID: <1464883532.1204.181.camel@freebsd.org> Subject: Re: how to MFC when the target moved? From: Ian Lepore To: Don Lewis , yaneurabeya@gmail.com Cc: freebsd-hackers@freebsd.org Date: Thu, 02 Jun 2016 10:05:32 -0600 In-Reply-To: <201606012212.u51MC2UR036796@gw.catspoiler.org> References: <201606012212.u51MC2UR036796@gw.catspoiler.org> Content-Type: text/plain; charset="us-ascii" X-Mailer: Evolution 3.16.5 FreeBSD GNOME Team Port Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jun 2016 09:01:43 -0000 On Wed, 2016-06-01 at 15:12 -0700, Don Lewis wrote: > On 1 Jun, Ngie Cooper wrote: > > On Wed, Jun 1, 2016 at 11:04 AM, Don Lewis > > 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. I ran into something similar last year; there's just something strange about sys/gnu/dts (maybe related to its vendor-branch heritage somehow). I eventually worked around it by just doing what I needed to do and then doing svn revert -R sys/gnu/dts, leaving only the mergeinfo I actually wanted to commit. -- Ian