Date: Thu, 02 Jun 2016 10:05:32 -0600 From: Ian Lepore <ian@freebsd.org> To: Don Lewis <truckman@FreeBSD.org>, yaneurabeya@gmail.com Cc: freebsd-hackers@freebsd.org Subject: Re: how to MFC when the target moved? Message-ID: <1464883532.1204.181.camel@freebsd.org> In-Reply-To: <201606012212.u51MC2UR036796@gw.catspoiler.org> References: <201606012212.u51MC2UR036796@gw.catspoiler.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <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. 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1464883532.1204.181.camel>