Date: Tue, 14 Jun 2016 23:25:21 -0700 (PDT) From: Don Lewis <truckman@FreeBSD.org> To: danielsh@apache.org Cc: yaneurabeya@gmail.com, freebsd-hackers@freebsd.org Subject: Re: how to MFC when the target moved? Message-ID: <201606150625.u5F6PL60031780@gw.catspoiler.org> In-Reply-To: <20160602110100.GA2451@tarsus.local2>
next in thread | previous in thread | raw e-mail | index | archive | help
On 2 Jun, Daniel Shahaf wrote: > 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 That doesn't quite work, either. The mergeinfo gets added to /usr/src/games/fortune instead of /usr/src.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606150625.u5F6PL60031780>