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> In-Reply-To: <CAGHfRMBO2GP-ZY1ZS57K=m%2BP2MMZOyitjykfcLYfhH1gu-Zb%2BQ@mail.gmail.com> References: <201606011804.u51I4NrN036166@gw.catspoiler.org> <CAGHfRMBO2GP-ZY1ZS57K=m%2BP2MMZOyitjykfcLYfhH1gu-Zb%2BQ@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20160602110100.GA2451>