how to MFC when the target moved?

Ngie Cooper yaneurabeya at gmail.com
Wed Jun 1 20:59:44 UTC 2016


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


More information about the freebsd-hackers mailing list