how to MFC when the target moved?

[Daniel Shahaf]

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